Release 3-3.12.2 - See CHANGELOG.md

Merge pull request #303 from alwynpan/feature/remove-deprecation-warning
#298 Use pip to install awscli to remove the deprecation warning
2025-12-21 21:33:28 +01:00 · 2023-12-03 22:05:28 -08:00 · 2023-12-03 22:03:40 -08:00 · 2023-12-04 15:32:42 +11:00 · 2023-11-30 07:21:58 -08:00
2 changed files with 15 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 3-3.12.2 2023-12-03 <dave at tiredofit dot ca>
+
+   ### Added
+      - Update AWS CLI 1.31.5
+      - Use pip to install awscli as opposed to via git repo
+
+
+## 3-3.12.1 2023-11-30 <dave at tiredofit dot ca>
+
+   ### Added
+      - Update AWS CLI to 1.31.4
+
+
 ## 3.12.0 2023-10-29 <alwynpan@github>

   ### Added
--- a/5
+++ b/5
@@ -9,7 +9,7 @@ ENV INFLUX_VERSION=1.8.0 \
    INFLUX2_VERSION=2.4.0 \
    MSODBC_VERSION=18.3.2.1-1 \
    MSSQL_VERSION=18.3.1.1-1 \
-    AWS_CLI_VERSION=1.25.97 \
+    AWS_CLI_VERSION=1.31.5 \
    CONTAINER_ENABLE_MESSAGING=FALSE \
    CONTAINER_ENABLE_MONITORING=TRUE \
    CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
@@ -73,8 +73,7 @@ RUN source /assets/functions/00-container && \
    \
    if [ $mssql = "true" ] ; then curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk ; curl -O https://download.microsoft.com/download/3/5/5/355d7943-a338-41a7-858d-53b259ea33f5/mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; ls -l ; echo y | apk add --allow-untrusted msodbcsql18_${MSODBC_VERSION}_${mssql_arch}.apk mssql-tools18_${MSSQL_VERSION}_${mssql_arch}.apk ; else echo >&2 "Detected non x86_64 or ARM64 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 && \
+    pip3 install --break-system-packages awscli==${AWS_CLI_VERSION} && \
    clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \
    go build -o /usr/sbin/influxd ./cmd/influxd && \
    strip /usr/sbin/influxd && \
Author	SHA1	Message	Date
dave@tiredofit.ca	d48a15d37f	Release 3-3.12.2 - See CHANGELOG.md	2023-12-03 22:05:28 -08:00
Dave Conroy	6b7b16c42b	Merge pull request #303 from alwynpan/feature/remove-deprecation-warning #298 Use pip to install awscli to remove the deprecation warning	2023-12-03 22:03:40 -08:00
Alwyn Pan	b64bd3168d	#298 Use pip to install awscli to remove the deprecation warning	2023-12-04 15:32:42 +11:00
dave@tiredofit.ca	35c806c369	Release 3-3.12.1 - See CHANGELOG.md	2023-11-30 07:21:58 -08:00