From d0b3dd64b7b4b31d425023bcb187ac883d43c358 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 11 Dec 2023 14:35:15 +1100 Subject: [PATCH 01/25] draft docker files --- Dockerfile.txt | 39 ++++++++++++++++++++++ docker-compose.yml | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 Dockerfile.txt create mode 100644 docker-compose.yml diff --git a/Dockerfile.txt b/Dockerfile.txt new file mode 100644 index 0000000..d8084e2 --- /dev/null +++ b/Dockerfile.txt @@ -0,0 +1,39 @@ +FROM osgeo/gdal:ubuntu-small-3.4.1 + +ENV DEBIAN_FRONTEND=noninteractive \ + LC_ALL=C.UTF-8 \ + LANG=C.UTF-8 + +# Apt installation +RUN apt-get update && \ + apt-get install -y \ + build-essential \ + fish \ + git \ + vim \ + htop \ + wget \ + unzip \ + python3-pip \ + libpq-dev python-dev \ + && apt-get autoclean && \ + apt-get autoremove && \ + rm -rf /var/lib/{apt,dpkg,cache,log} + +# Pip installation +RUN mkdir -p /conf +COPY requirements.txt /conf/ +RUN pip install -r /conf/requirements.txt + +# Copy source code and install it +RUN mkdir -p /code +WORKDIR /code +ADD . /code + +RUN echo "Installing dea-burn-cube through the Dockerfile." +RUN pip install --extra-index-url="https://packages.dea.ga.gov.au" . + +RUN pip freeze && pip check + +# Make sure it's working +RUN dea-burn-cube --version diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..9a80e2d --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,80 @@ +version: "3.6" + +services: + public_odc: + image: postgres:11.5-alpine + ports: + - "5436:5432" + environment: + - POSTGRES_DB=public-odc + - POSTGRES_PASSWORD=opendatacubepassword + - POSTGRES_USER=public-odc + expose: + - 5432 + restart: always + + private_odc: + image: postgres:11.5-alpine + ports: + - "5435:5432" + environment: + - POSTGRES_DB=private-odc + - POSTGRES_PASSWORD=opendatacubepassword + - POSTGRES_USER=private-odc + expose: + - 5432 + restart: always + + burn_cube_app: + build: + context: . + args: + - ENVIRONMENT=dev + environment: + - ODC_DB_HOSTNAME=public_odc + - HNRS_DB_HOSTNAME=private_odc + - HNRS_DC_DB_USERNAME=private-odc + - ODC_DB_USERNAME=public-odc + - HNRS_DC_DB_PASSWORD=opendatacubepassword + - ODC_DB_PASSWORD=opendatacubepassword + - HNRS_DC_DB_DATABASE=private-odc + - ODC_DB_DATABASE=public-odc + - AWS_DEFAULT_REGION=ap-southeast-2 + - AWS_ACCESS_KEY_ID=fake_id + - AWS_SECRET_ACCESS_KEY=fake_key + - AWS_NO_SIGN_REQUEST=YES + - SQLALCHEMY_SILENCE_UBER_WARNING=1 + volumes: + - .:/code + depends_on: + - public_odc + - private_odc + command: ["/bin/sh", "-ec", "while :; do echo '.'; sleep 180 ; done"] + + public_index: + image: opendatacube/datacube-index:latest + environment: + - DB_HOSTNAME=public_odc + - DB_USERNAME=public-odc + - DB_PASSWORD=opendatacubepassword + - DB_DATABASE=public-odc + - DB_PORT=5432 + - AWS_DEFAULT_REGION=ap-southeast-2 + - SQLALCHEMY_SILENCE_UBER_WARNING=1 + depends_on: + - public_odc + entrypoint: bash -c 'sleep infinity' + + private_index: + image: opendatacube/datacube-index:latest + environment: + - DB_HOSTNAME=private_odc + - DB_USERNAME=private-odc + - DB_PASSWORD=opendatacubepassword + - DB_DATABASE=private-odc + - DB_PORT=5432 + - AWS_DEFAULT_REGION=ap-southeast-2 + - SQLALCHEMY_SILENCE_UBER_WARNING=1 + depends_on: + - private_odc + entrypoint: bash -c 'sleep infinity' From 24dbbf276b5ee4c6e0cd7f3291717574a3779d2b Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 11 Dec 2023 14:43:23 +1100 Subject: [PATCH 02/25] Update docker-compose.yml --- docker-compose.yml | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9a80e2d..eaa6e4f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,42 +13,27 @@ services: - 5432 restart: always - private_odc: - image: postgres:11.5-alpine - ports: - - "5435:5432" - environment: - - POSTGRES_DB=private-odc - - POSTGRES_PASSWORD=opendatacubepassword - - POSTGRES_USER=private-odc - expose: - - 5432 - restart: always - - burn_cube_app: + dea_intertidal_app: build: context: . args: - ENVIRONMENT=dev environment: - ODC_DB_HOSTNAME=public_odc - - HNRS_DB_HOSTNAME=private_odc - - HNRS_DC_DB_USERNAME=private-odc - ODC_DB_USERNAME=public-odc - - HNRS_DC_DB_PASSWORD=opendatacubepassword - ODC_DB_PASSWORD=opendatacubepassword - - HNRS_DC_DB_DATABASE=private-odc - ODC_DB_DATABASE=public-odc - AWS_DEFAULT_REGION=ap-southeast-2 - AWS_ACCESS_KEY_ID=fake_id - AWS_SECRET_ACCESS_KEY=fake_key - AWS_NO_SIGN_REQUEST=YES - SQLALCHEMY_SILENCE_UBER_WARNING=1 + - GDAL_HTTP_MAX_RETRY=5 volumes: - .:/code + - ./tide_models/:/var/share/tide_models depends_on: - public_odc - - private_odc command: ["/bin/sh", "-ec", "while :; do echo '.'; sleep 180 ; done"] public_index: @@ -64,17 +49,3 @@ services: depends_on: - public_odc entrypoint: bash -c 'sleep infinity' - - private_index: - image: opendatacube/datacube-index:latest - environment: - - DB_HOSTNAME=private_odc - - DB_USERNAME=private-odc - - DB_PASSWORD=opendatacubepassword - - DB_DATABASE=private-odc - - DB_PORT=5432 - - AWS_DEFAULT_REGION=ap-southeast-2 - - SQLALCHEMY_SILENCE_UBER_WARNING=1 - depends_on: - - private_odc - entrypoint: bash -c 'sleep infinity' From c726255b90f2433ef30768b1a31480a0e06862ee Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 11 Dec 2023 14:43:57 +1100 Subject: [PATCH 03/25] Rename Dockerfile.txt to Dockerfile --- Dockerfile.txt => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile.txt => Dockerfile (100%) diff --git a/Dockerfile.txt b/Dockerfile similarity index 100% rename from Dockerfile.txt rename to Dockerfile From c416ce041bb906bc2d1d39ea56f467bc1e7f28b3 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 11 Dec 2023 14:59:43 +1100 Subject: [PATCH 04/25] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8084e2..6ae9c91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update && \ # Pip installation RUN mkdir -p /conf -COPY requirements.txt /conf/ +RUN pip-compile --extra-index-url=https://packages.dea.ga.gov.au/ --output-file=/conf/requirements.txt requirements.in RUN pip install -r /conf/requirements.txt # Copy source code and install it @@ -36,4 +36,4 @@ RUN pip install --extra-index-url="https://packages.dea.ga.gov.au" . RUN pip freeze && pip check # Make sure it's working -RUN dea-burn-cube --version +RUN dea-intertidal --version From f050263e9f12c41930ee4ea76965ee31542eb858 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 18 Dec 2023 12:33:39 +1100 Subject: [PATCH 05/25] dea-intertidal-image.yml Draft workflow for creating a Docker image and writing to the aws ecr. --- .github/workflows/dea-intertidal-image.yml | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .github/workflows/dea-intertidal-image.yml diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml new file mode 100644 index 0000000..2808ee1 --- /dev/null +++ b/.github/workflows/dea-intertidal-image.yml @@ -0,0 +1,74 @@ +name: DEA Intertidal App Image Push + +env: + IMAGE_NAME: geoscienceaustralia/dea-intertidal-app + +on: + push: + branches: + - main + paths: + - 'dea_intertidal/**' + - '.github/workflows/dea-intertidal-image.yml' + - 'Dockerfile' + + release: + types: [created, edited, published] + + +permissions: + id-token: write # This is required for requesting the JWT + contents: read # This is required for actions/checkout + +jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Build DEA Intertidal App image + timeout-minutes: 20 + shell: bash + run: | + docker-compose build + + push_ecr: + needs: [test] + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + role-to-assume: arn:aws:iam::538673716275:role/github-actions-role + aws-region: ap-southeast-2 + + - name: Get tag for this build if it exists + if: github.event_name == 'release' + run: | + echo "RELEASE=${GITHUB_REF/refs\/tags\/}" >> $GITHUB_ENV + + - name: Push release image to ECR + uses: whoan/docker-build-with-cache-action@master + if: github.event_name == 'release' + with: + registry: 538673716275.dkr.ecr.ap-southeast-2.amazonaws.com + image_name: ${{ env.IMAGE_NAME }} + image_tag: ${{ env.RELEASE }} + + - name: Get git commit hash for push to main + if: github.event_name != 'release' + run: | + echo "TAG=dev$(git rev-parse --short HEAD)" \ + >> $GITHUB_ENV + + - name: Push unstable image to ECR + uses: whoan/docker-build-with-cache-action@master + if: github.event_name != 'release' + with: + registry: 538673716275.dkr.ecr.ap-southeast-2.amazonaws.com + image_name: ${{ env.IMAGE_NAME }} + image_tag: latest,${{ env.TAG }} From 5ccd11bc4a84be32f815d04a248d42945cb3aaf3 Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Mon, 18 Dec 2023 15:23:39 +1100 Subject: [PATCH 06/25] Add docker ignore for notebooks --- .dockerignore | 1 + .gitignore | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..80de5bf --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +notebooks \ No newline at end of file diff --git a/.gitignore b/.gitignore index 54ff8d3..7fa60d9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,7 @@ !*.ipynb !*.sh !*.yaml -!*.gitignore \ No newline at end of file +!*.yml +!*.in +!*.gitignore +!*.dockerignore \ No newline at end of file From 4815fa47b32bcdeb2d38ed750b466b4fa396bc2c Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Mon, 18 Dec 2023 15:24:50 +1100 Subject: [PATCH 07/25] Update .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7fa60d9..05946da 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ !*.yml !*.in !*.gitignore -!*.dockerignore \ No newline at end of file +!*.dockerignore +!*.Dockerfile From 58851a65a50e121d6764e2ec3cbe41a1660fae3f Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Mon, 18 Dec 2023 15:25:00 +1100 Subject: [PATCH 08/25] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 05946da..b06333e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,4 @@ !*.in !*.gitignore !*.dockerignore -!*.Dockerfile +!*Dockerfile From a6ba64327837a0af0a2a93fa8a602e8c9650b087 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 18 Dec 2023 17:36:17 +1100 Subject: [PATCH 09/25] Update Dockerfile Co-authored-by: Robbi Bishop-Taylor --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ae9c91..d3ba5db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN mkdir -p /code WORKDIR /code ADD . /code -RUN echo "Installing dea-burn-cube through the Dockerfile." +RUN echo "Installing dea-intertidal through the Dockerfile." RUN pip install --extra-index-url="https://packages.dea.ga.gov.au" . RUN pip freeze && pip check From dc2bfb1499847abd107a4d64e17e17e3cff45cfa Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 18 Dec 2023 17:38:41 +1100 Subject: [PATCH 10/25] Update docker-compose.yml Increasing GDAL_HTTP_MAX_RETRY to 10 Co-authored-by: Robbi Bishop-Taylor --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index eaa6e4f..28e84f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: - AWS_SECRET_ACCESS_KEY=fake_key - AWS_NO_SIGN_REQUEST=YES - SQLALCHEMY_SILENCE_UBER_WARNING=1 - - GDAL_HTTP_MAX_RETRY=5 + - GDAL_HTTP_MAX_RETRY=10 volumes: - .:/code - ./tide_models/:/var/share/tide_models From 97be283e2f5ac1e1042452e7ec00be9bd389be75 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 18 Dec 2023 17:40:07 +1100 Subject: [PATCH 11/25] Remove App from the name of the DEA Intertidal docker image Co-authored-by: Robbi Bishop-Taylor --- .github/workflows/dea-intertidal-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml index 2808ee1..65cd9ae 100644 --- a/.github/workflows/dea-intertidal-image.yml +++ b/.github/workflows/dea-intertidal-image.yml @@ -1,4 +1,4 @@ -name: DEA Intertidal App Image Push +name: DEA Intertidal Image Push env: IMAGE_NAME: geoscienceaustralia/dea-intertidal-app From 25b1b38a5f53a087999a763dcae0e3ed7a5ecd87 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 18 Dec 2023 17:40:32 +1100 Subject: [PATCH 12/25] Remove App from the name of the DEA Intertidal docker image Co-authored-by: Robbi Bishop-Taylor --- .github/workflows/dea-intertidal-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml index 65cd9ae..85d4c5f 100644 --- a/.github/workflows/dea-intertidal-image.yml +++ b/.github/workflows/dea-intertidal-image.yml @@ -1,7 +1,7 @@ name: DEA Intertidal Image Push env: - IMAGE_NAME: geoscienceaustralia/dea-intertidal-app + IMAGE_NAME: geoscienceaustralia/dea-intertidal on: push: From f8e78add0fc840606091c94b438dea23479f9deb Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 18 Dec 2023 17:40:52 +1100 Subject: [PATCH 13/25] Remove App from the name of the DEA Intertidal docker image Co-authored-by: Robbi Bishop-Taylor --- .github/workflows/dea-intertidal-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml index 85d4c5f..ee7c5de 100644 --- a/.github/workflows/dea-intertidal-image.yml +++ b/.github/workflows/dea-intertidal-image.yml @@ -27,7 +27,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - - name: Build DEA Intertidal App image + - name: Build DEA Intertidal image timeout-minutes: 20 shell: bash run: | From 9d4a2e5e367225b6b232e9fb5dea855af8368ce5 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Mon, 18 Dec 2023 17:41:08 +1100 Subject: [PATCH 14/25] Remove App from the name of the DEA Intertidal docker image Co-authored-by: Robbi Bishop-Taylor --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 28e84f0..42840a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - 5432 restart: always - dea_intertidal_app: + dea_intertidal: build: context: . args: From 8b4e35a82beacd76f035674594ce6fc088f94afd Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 10:00:20 +1100 Subject: [PATCH 15/25] print out CLI usage instead Co-authored-by: Robbi Bishop-Taylor --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d3ba5db..6b6887f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,4 +36,4 @@ RUN pip install --extra-index-url="https://packages.dea.ga.gov.au" . RUN pip freeze && pip check # Make sure it's working -RUN dea-intertidal --version +RUN dea-intertidal --help From bdbfeb441c16430842b82ac51b9592f340428189 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 10:03:39 +1100 Subject: [PATCH 16/25] Update folders included Co-authored-by: Robbi Bishop-Taylor --- .github/workflows/dea-intertidal-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml index ee7c5de..8cf118d 100644 --- a/.github/workflows/dea-intertidal-image.yml +++ b/.github/workflows/dea-intertidal-image.yml @@ -8,7 +8,7 @@ on: branches: - main paths: - - 'dea_intertidal/**' + - 'intertidal/**' - '.github/workflows/dea-intertidal-image.yml' - 'Dockerfile' From 92c0dbfca62844c6a95b6ab2d4cf4e85978caeb0 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 10:10:08 +1100 Subject: [PATCH 17/25] Update folders included Include data folder --- .github/workflows/dea-intertidal-image.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml index 8cf118d..0dbffd1 100644 --- a/.github/workflows/dea-intertidal-image.yml +++ b/.github/workflows/dea-intertidal-image.yml @@ -6,9 +6,10 @@ env: on: push: branches: - - main + - develop paths: - 'intertidal/**' + - 'data/**' - '.github/workflows/dea-intertidal-image.yml' - 'Dockerfile' From 2414e431052baa367888251da81d6ec26b8680a7 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 10:19:35 +1100 Subject: [PATCH 18/25] fixed typo --- .github/workflows/dea-intertidal-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml index 0dbffd1..267d26d 100644 --- a/.github/workflows/dea-intertidal-image.yml +++ b/.github/workflows/dea-intertidal-image.yml @@ -6,7 +6,7 @@ env: on: push: branches: - - develop + - workflow paths: - 'intertidal/**' - 'data/**' From f6fd10d2eab148d2d8fe2770a8e94c2a4c04ec44 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 10:27:41 +1100 Subject: [PATCH 19/25] Include install of pip-tools in the Docker file Co-authored-by: Robbi Bishop-Taylor --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6b6887f..241e068 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,9 @@ RUN apt-get update && \ apt-get autoremove && \ rm -rf /var/lib/{apt,dpkg,cache,log} +# Install pip-tools +RUN pip install pip-tools + # Pip installation RUN mkdir -p /conf RUN pip-compile --extra-index-url=https://packages.dea.ga.gov.au/ --output-file=/conf/requirements.txt requirements.in From dea1a65e8b73d9b136389679db0ab30847467113 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 10:35:06 +1100 Subject: [PATCH 20/25] include requirements.in in build --- .github/workflows/dea-intertidal-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml index 267d26d..d9c7045 100644 --- a/.github/workflows/dea-intertidal-image.yml +++ b/.github/workflows/dea-intertidal-image.yml @@ -12,6 +12,7 @@ on: - 'data/**' - '.github/workflows/dea-intertidal-image.yml' - 'Dockerfile' + - 'requirements.in' release: types: [created, edited, published] From 12da8b8aa1cf19554ca99875dd1444b17d5ae11d Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Tue, 19 Dec 2023 10:41:48 +1100 Subject: [PATCH 21/25] Test of changing requirements.in path --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 241e068..63e43c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,8 @@ RUN pip install pip-tools # Pip installation RUN mkdir -p /conf -RUN pip-compile --extra-index-url=https://packages.dea.ga.gov.au/ --output-file=/conf/requirements.txt requirements.in +COPY requirements.in /conf/ +RUN pip-compile --extra-index-url=https://packages.dea.ga.gov.au/ --output-file=/conf/requirements.txt /conf/requirements.in RUN pip install -r /conf/requirements.txt # Copy source code and install it From acc3bfe4d1459238f669f1de911973d80c2d7adb Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 11:00:51 +1100 Subject: [PATCH 22/25] Update requirements.in commenting out bokeh for the Docker build --- requirements.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.in b/requirements.in index 3eef6e2..7dac5fc 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,6 @@ --extra-index-url=https://packages.dea.ga.gov.au/ aiohttp -bokeh==3.2.2 # temporary fix for Dask issue +# bokeh==3.2.2 # temporary fix for Dask issue botocore click==8.1.3 datacube[s3,performance]==1.8.13 @@ -21,4 +21,4 @@ scipy==1.10.1 sunriset==1.0 Shapely==2.0.1 tqdm==4.65.0 -xarray==2023.1.0 \ No newline at end of file +xarray==2023.1.0 From 37c211373e46fbbd762887261ae6d345feab9053 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 11:18:05 +1100 Subject: [PATCH 23/25] Update requirements.in added - rioxarray==0.15.0 same version as sandbox --- requirements.in | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.in b/requirements.in index 7dac5fc..3c067c6 100644 --- a/requirements.in +++ b/requirements.in @@ -22,3 +22,4 @@ sunriset==1.0 Shapely==2.0.1 tqdm==4.65.0 xarray==2023.1.0 +rioxarray==0.15.0 From 05d52689b558b41d7b6e282109136580fc0f33af Mon Sep 17 00:00:00 2001 From: Robbi Bishop-Taylor Date: Tue, 19 Dec 2023 11:42:08 +1100 Subject: [PATCH 24/25] Remove version for rioxarray --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 3c067c6..8c819b6 100644 --- a/requirements.in +++ b/requirements.in @@ -22,4 +22,4 @@ sunriset==1.0 Shapely==2.0.1 tqdm==4.65.0 xarray==2023.1.0 -rioxarray==0.15.0 +rioxarray From 9b1a08d644c1044d8d4467a9f2c0c21109d59b01 Mon Sep 17 00:00:00 2001 From: Vanessa Newey Date: Tue, 19 Dec 2023 12:04:39 +1100 Subject: [PATCH 25/25] change branch to main --- .github/workflows/dea-intertidal-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dea-intertidal-image.yml b/.github/workflows/dea-intertidal-image.yml index d9c7045..2e29428 100644 --- a/.github/workflows/dea-intertidal-image.yml +++ b/.github/workflows/dea-intertidal-image.yml @@ -6,7 +6,7 @@ env: on: push: branches: - - workflow + - main paths: - 'intertidal/**' - 'data/**'