Skip to content

Commit

Permalink
update docker build relevant
Browse files Browse the repository at this point in the history
  • Loading branch information
Emma Ai committed Nov 28, 2023
1 parent 7c59e39 commit e42cf82
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ on:
types:
- completed

permissions:
contents: read
packages: read

jobs:
build-wheels:
if: |
Expand All @@ -36,7 +40,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v1
with:
python-version: 3.8
python-version: 3.10

- name: Install Dependencies
run: |
Expand All @@ -61,7 +65,10 @@ jobs:
test-wheels:
runs-on: ubuntu-latest
container:
image: opendatacube/datacube-statistician:latest
image: ghcr.io/${{ github.repository }}:latest
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

services:
postgres:
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/statistician-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ on:
permissions:
id-token: write # This is required for requesting the JWT
contents: read # This is required for actions/checkout
packages: write # This is required for pushing to ghcr

jobs:
test:
Expand Down Expand Up @@ -97,16 +98,18 @@ jobs:
&& (needs.set_tags.outputs.image_tag)
needs: [test, set_tags]
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Push image to dockerhub
- name: Push image to ghcr
uses: whoan/docker-build-with-cache-action@master
with:
context: ./docker
username: gadockersvc
password: ${{ secrets.GADOCKERSVC_PASSWORD }}
image_name: ${{ env.IMAGE_NAME }}
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
image_name: ${{ github.repository }}
image_tag: latest,${{ needs.set_tags.outputs.image_tag }}
build_extra_args: '{"--build-arg": "UPDATE_VERSION=${{ needs.set_tags.outputs.image_tag }}"}'
6 changes: 3 additions & 3 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

--extra-index-url https://packages.dea.ga.gov.au/
datacube[performance,s3]>=1.8.11
datacube[performance,s3]>=1.8.17
hdstats==0.1.8.post1
odc-algo @ git+https://github.com/opendatacube/odc-algo@b8dcfce
odc-algo @ git+https://github.com/opendatacube/odc-algo@851e782
odc-apps-cloud==0.2.2
# For testing
odc-apps-dc-tools==0.2.12
odc-cloud==0.2.3
odc-dscache==0.2.2
odc-stac==0.3.6
odc-stac==0.3.8

# odc-stac is in PyPI
odc-stats[ows]

0 comments on commit e42cf82

Please sign in to comment.