From 54a3a4b0a6c4a0a9596568d9ce3446b3786fb6b4 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Thu, 24 Aug 2023 12:16:10 -0700
Subject: [PATCH] Release 3.9.11 - See CHANGELOG.md

---
 CHANGELOG.md |  6 ++++++
 Dockerfile   | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4261291..6e26b8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.9.11 2023-08-24 <dave at tiredofit dot ca>
+
+   ### Changed
+      - AWS CLI 2.13.9
+
+
 ## 3.9.10 2023-08-23 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/Dockerfile b/Dockerfile
index 36180c8..675836d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 ENV INFLUX_VERSION=1.8.0 \
     INFLUX2_VERSION=2.4.0 \
     MSSQL_VERSION=18.0.1.1-1 \
-    AWS_CLI_VERSION=1.25.97 \
+    AWS_CLI_VERSION=2.13.9 \
     CONTAINER_ENABLE_MESSAGING=FALSE \
     CONTAINER_ENABLE_MONITORING=TRUE \
     CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
@@ -30,6 +30,8 @@ RUN source /assets/functions/00-container && \
                openssl-dev \
                libffi-dev \
                python3-dev \
+               py3-flit-core \
+               py3-gpep517 \
                py3-setuptools \
                py3-pip \
                xz-dev \
@@ -47,13 +49,20 @@ RUN source /assets/functions/00-container && \
                postgresql15 \
                postgresql15-client \
                pv \
+               py3-awscrt \
                py3-botocore \
+               py3-certifi \
                py3-colorama \
                py3-cryptography \
+               py3-dateutil \
+               py3-distro \
                py3-docutils \
                py3-jmespath \
+               py3-prompt_toolkit \
                py3-rsa \
+               py3-ruamel.yaml \
                py3-s3transfer \
+               py3-urllib3 \
                py3-yaml \
                python3 \
                redis \
@@ -73,7 +82,11 @@ RUN source /assets/functions/00-container && \
     if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/msodbcsql18_${MSSQL_VERSION}_amd64.apk ; curl -O https://download.microsoft.com/download/b/9/f/b9f3cce4-3925-46d4-9f46-da08869c6486/mssql-tools18_${MSSQL_VERSION}_amd64.apk ; echo y | apk add --allow-untrusted msodbcsql18_${MSSQL_VERSION}_amd64.apk mssql-tools18_${MSSQL_VERSION}_amd64.apk ; else echo >&2 "Detected non x86_64 build variant, skipping MSSQL installation" ; fi; \
     if [ $influx2 = "true" ] ; then curl -sSL https://dl.influxdata.com/influxdb/releases/influxdb2-client-${INFLUX2_VERSION}-linux-${influx_arch}.tar.gz | tar xvfz - --strip=1 -C /usr/src/ ; chmod +x /usr/src/influx ; mv /usr/src/influx /usr/sbin/ ; else echo >&2 "Unable to build Influx 2 on this system" ; fi ; \
     clone_git_repo https://github.com/aws/aws-cli "${AWS_CLI_VERSION}" && \
-    python3 setup.py install --prefix=/usr && \
+    gpep517 build-wheel \
+		--wheel-dir dist \
+                --output-fd 2 \
+                && \
+    python3 -m installer dist/*.whl && \
     clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \
     go build -o /usr/sbin/influxd ./cmd/influxd && \
     strip /usr/sbin/influxd && \
@@ -105,5 +118,4 @@ RUN source /assets/functions/00-container && \
             /tmp/* \
             /usr/src/*
 
-
 COPY install  /