Skip to content

Commit c1d2dc3

Browse files
committed
Release 3.9.11 - See CHANGELOG.md
1 parent bf64638 commit c1d2dc3

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 3.9.11 2023-08-24 <dave at tiredofit dot ca>
2+
3+
### Changed
4+
- AWS CLI 2.13.9
5+
6+
17
## 3.9.10 2023-08-23 <dave at tiredofit dot ca>
28

39
### Changed

Dockerfile

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LABEL maintainer="Dave Conroy (github.com/tiredofit)"
88
ENV INFLUX_VERSION=1.8.0 \
99
INFLUX2_VERSION=2.4.0 \
1010
MSSQL_VERSION=18.0.1.1-1 \
11-
AWS_CLI_VERSION=1.25.97 \
11+
AWS_CLI_VERSION=2.13.12 \
1212
CONTAINER_ENABLE_MESSAGING=FALSE \
1313
CONTAINER_ENABLE_MONITORING=TRUE \
1414
CONTAINER_PROCESS_RUNAWAY_PROTECTOR=FALSE \
@@ -24,13 +24,17 @@ RUN source /assets/functions/00-container && \
2424
build-base \
2525
bzip2-dev \
2626
cargo \
27+
cmake \
2728
git \
2829
go \
2930
libarchive-dev \
3031
openssl-dev \
3132
libffi-dev \
3233
python3-dev \
34+
py3-flit-core \
35+
py3-gpep517 \
3336
py3-setuptools \
37+
py3-wheel \
3438
py3-pip \
3539
xz-dev \
3640
&& \
@@ -47,13 +51,20 @@ RUN source /assets/functions/00-container && \
4751
postgresql15 \
4852
postgresql15-client \
4953
pv \
54+
py3-awscrt \
5055
py3-botocore \
56+
py3-certifi \
5157
py3-colorama \
5258
py3-cryptography \
59+
py3-dateutil \
60+
py3-distro \
5361
py3-docutils \
5462
py3-jmespath \
63+
py3-prompt_toolkit \
5564
py3-rsa \
65+
py3-ruamel.yaml \
5666
py3-s3transfer \
67+
py3-urllib3 \
5768
py3-yaml \
5869
python3 \
5970
redis \
@@ -73,7 +84,10 @@ RUN source /assets/functions/00-container && \
7384
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; \
7485
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 ; \
7586
clone_git_repo https://github.com/aws/aws-cli "${AWS_CLI_VERSION}" && \
76-
python3 setup.py install --prefix=/usr && \
87+
/usr/bin/python -m pip install --prefer-binary 'cryptography>=3.3.2,<40.0.2' 'ruamel.yaml>=0.15.0,<=0.17.21' 'awscrt>=0.16.4,<=0.16.16' && \
88+
./configure && \
89+
make && \
90+
make install && \
7791
clone_git_repo https://github.com/influxdata/influxdb "${INFLUX_VERSION}" && \
7892
go build -o /usr/sbin/influxd ./cmd/influxd && \
7993
strip /usr/sbin/influxd && \
@@ -105,5 +119,4 @@ RUN source /assets/functions/00-container && \
105119
/tmp/* \
106120
/usr/src/*
107121

108-
109122
COPY install /

0 commit comments

Comments
 (0)