From 36bfbbfbaa4be351147d53af1483e8db631a598b Mon Sep 17 00:00:00 2001
From: matt-fry-ga <matthew.fry@ga.gov.au>
Date: Wed, 4 Oct 2023 12:56:16 +1100
Subject: [PATCH 1/2] Update AWS CLI v2 package

---
 docker/env.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/env.yaml b/docker/env.yaml
index 78cd20f..d9f362f 100644
--- a/docker/env.yaml
+++ b/docker/env.yaml
@@ -20,7 +20,7 @@ dependencies:
   - rio-cogeo
   - access
   - aiobotocore
-  - awscli
+  - awscliv2
   - boto3
   - affine
   - aiohttp

From ae5381862379cc35fec96bc85c99319387732473 Mon Sep 17 00:00:00 2001
From: matt-fry-ga <matthew.fry@ga.gov.au>
Date: Thu, 5 Oct 2023 07:36:35 +0000
Subject: [PATCH 2/2] Add docker RUN command for AWS CLI v2

---
 docker/Dockerfile | 9 +++++++++
 docker/env.yaml   | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 49a6f21..fd52837 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -48,6 +48,15 @@ RUN echo "Enable server extensions" \
    && jupyter server extension list \
    && echo "...done"
 
+RUN echo "Install AWS CLI v2" \
+   && curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/tmp/awscliv2.zip" \
+   && unzip /tmp/awscliv2.zip -d /tmp \
+   && /tmp/aws/install -i /env/bin/aws-cli -b /env/bin \
+   && aws --version \
+   && rm -f /tmp/awscliv2.zip \
+   && rm -fr /tmp/aws \
+   && echo "...done"
+
 COPY assets/sync_repo assets/jupyterhub-singleuser /usr/local/bin/
 COPY assets/overrides.json /env/share/jupyter/lab/settings/
 
diff --git a/docker/env.yaml b/docker/env.yaml
index d9f362f..88a2b19 100644
--- a/docker/env.yaml
+++ b/docker/env.yaml
@@ -20,7 +20,6 @@ dependencies:
   - rio-cogeo
   - access
   - aiobotocore
-  - awscliv2
   - boto3
   - affine
   - aiohttp