From cead799e37719a7828e46bdc4de226b2fda1198c Mon Sep 17 00:00:00 2001
From: Robbi Bishop-Taylor <Robbi.BishopTaylor@ga.gov.au>
Date: Mon, 8 Jul 2024 15:17:08 +1000
Subject: [PATCH] Update Sandbox image packages (#286)

* Update packages

* Update env.yaml

* Update requirements.txt

* remove pygeos for compatibility

* update dive action

* Add xarray-spatial

---------

Co-authored-by: Emma Ai <emma.ai@ga.gov.au>
---
 .github/workflows/dive.yml | 12 +++++++-----
 docker/env.yaml            | 13 ++++++++-----
 docker/requirements.txt    |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/dive.yml b/.github/workflows/dive.yml
index 6d7863a..83372dc 100644
--- a/.github/workflows/dive.yml
+++ b/.github/workflows/dive.yml
@@ -17,6 +17,8 @@ on:
 env:
   ORG: dea
   IMAGE: dea-sandbox
+  DIVE: wagoodman/dive:v0.12.0
+  DOCKER_API: 1.37
 
 jobs:
   dive:
@@ -81,11 +83,11 @@ jobs:
           sudo rm -rf ${GITHUB_WORKSPACE}/.git
 
       - name: Dive
-        uses: yuichielectric/dive-action@0.0.3
-        with:
-          image: ${{ env.ORG }}/${{ env.IMAGE}}:_build
-          config-file: ${{ github.workspace }}/dive-ci.yml
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          docker pull ${DIVE}
+          docker run -e CI=true -e DOCKER_API_VERSION=${DOCKER_API} --rm -v /var/run/docker.sock:/var/run/docker.sock \
+          --mount type=bind,source=${{ github.workspace }}/dive-ci.yml,target=/.dive-ci \
+          ${DIVE}  --ci-config /.dive-ci ${ORG}/${IMAGE}:_build
 
       - name: Docker image size check
         uses: wemake-services/docker-image-size-limit@master
diff --git a/docker/env.yaml b/docker/env.yaml
index 18db878..182be01 100644
--- a/docker/env.yaml
+++ b/docker/env.yaml
@@ -13,6 +13,7 @@ dependencies:
   - libpq
   - git
   - wget
+  - curl
   - unzip
   - htop
   - tmux
@@ -63,10 +64,10 @@ dependencies:
   - frozenlist
   - fsspec
   - GeoAlchemy2
-  - geopandas
+  - geopandas<1.0.0
   - greenlet
   - HeapDict
-  - icu
+  - icu>=73.2
   - idna
   - imageio
   - importlib-metadata
@@ -109,7 +110,7 @@ dependencies:
   - pyproj
   - pyrsistent
   - pystac
-  - pystac-client
+  - pystac-client>=0.8.1
   - pytest!=8.1.0
   - python-dateutil
   - python-rapidjson
@@ -174,15 +175,16 @@ dependencies:
   - dask-ml
   - pathos
   - scikit-learn
-  - tensorflow>=2.10
+  - tensorflow>=2.16
   - xgboost
   - zarr
   - bokeh=3.2.2
   - descartes
   - matplotlib
   - seaborn
-  - pygeos
+    # - pygeos
   - cmocean
+  - gcsfs
   - geohash2
   - geojson
   - geopy
@@ -203,6 +205,7 @@ dependencies:
   - urbanaccess
   - contextily
   - pyTMD<=2.1.0
+  - xarray-spatial
 # jupyter things
   - autopep8
   - black
diff --git a/docker/requirements.txt b/docker/requirements.txt
index 964995e..cc82e74 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -21,7 +21,7 @@ s2cloudmask
 opencv-python-headless
 opencv-contrib-python-headless
 
-datacube[performance,s3] >= 1.8.17
+datacube[performance,s3] >= 1.8.19
 odc-algo @ git+https://github.com/opendatacube/odc-algo@b8dcfce
 odc-cloud[ASYNC]
 odc-dscache