Skip to content

Commit c4224df

Browse files
committed
Update Alpine Base and cloud CLI tools, also target Postgres 14.7
1 parent a63121a commit c4224df

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

Dockerfile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.17
22

33
# Install some tools
44
# python is required for gsutil
55
RUN set -x \
6-
&& apk add --update bash findutils postgresql-client gzip bzip2 lz4 xz unzip zip coreutils python3 rsync \
6+
&& apk add --update bash findutils postgresql-client gzip bzip2 lz4 xz unzip zip coreutils python3 rsync curl \
77
&& rm -rf /var/cache/apk/* \
8-
&& ln -s /usr/bin/python3 /usr/bin/python \
98
;
109

1110
# Install Panubo bash-container
1211
RUN set -x \
13-
&& BASHCONTAINER_VERSION=0.7.0 \
14-
&& BASHCONTAINER_SHA256=45065b105614543b7775131728dbdf680586f553163240e4dd7226f03a35d4fa \
12+
&& BASHCONTAINER_VERSION=0.7.2 \
13+
&& BASHCONTAINER_SHA256=87c4b804f0323d8f0856cb4fbf2f7859174765eccc8b0ac2d99b767cecdcf5c6 \
1514
&& if [ -n "$(readlink /usr/bin/wget)" ]; then \
1615
fetchDeps="${fetchDeps} wget"; \
1716
fi \
@@ -20,7 +19,7 @@ RUN set -x \
2019
&& wget -nv https://github.com/panubo/bash-container/releases/download/v${BASHCONTAINER_VERSION}/panubo-functions.tar.gz \
2120
&& echo "${BASHCONTAINER_SHA256} panubo-functions.tar.gz" > /tmp/SHA256SUM \
2221
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected $(sha256sum panubo-functions.tar.gz)"; exit 1; )) \
23-
&& tar -C / -zxf panubo-functions.tar.gz \
22+
&& tar --no-same-owner -C / -zxf panubo-functions.tar.gz \
2423
&& rm -rf /tmp/* \
2524
&& apk del ${fetchDeps} \
2625
;
@@ -45,8 +44,8 @@ RUN set -x \
4544

4645
# Install Gcloud SDK (required for gsutil workload identity authentication)
4746
ENV \
48-
GCLOUD_VERSION=331.0.0 \
49-
GCLOUD_CHECKSUM=f90c2df5bd0b3498d7e33112f17439eead8c94ae7d60a1cab0091de0eee62c16
47+
GCLOUD_VERSION=424.0.0 \
48+
GCLOUD_CHECKSUM=1fed39626f23352e0f97623d5009ff1bb6c4ffd3875c85f4205f309292696b18
5049

5150
RUN set -x \
5251
&& apk --no-cache add python3 \
@@ -60,22 +59,24 @@ RUN set -x \
6059
&& rm -rf /tmp/* /root/.config/gcloud \
6160
;
6261

62+
# Install AWS CLI
6363
ENV \
6464
PYTHONIOENCODING=UTF-8 \
6565
PYTHONUNBUFFERED=0 \
6666
PAGER=more \
67-
AWS_CLI_VERSION=1.16.286 \
68-
AWS_CLI_CHECKSUM=7e99ea733b3d97b1fa178fab08b5d7802d0647ad514c14221513c03ce920ce83
67+
AWS_CLI_VERSION=1.27.103 \
68+
AWS_CLI_CHECKSUM=0fed454146160807e273c4fd9bb1d0ba0926e3fb8ed3fc55e9251ebd2d53407c
6969

7070
RUN set -x \
71-
&& apk add --no-cache ca-certificates wget \
71+
&& apk --update add --no-cache ca-certificates wget unzip \
7272
&& cd /tmp \
7373
&& wget -nv https://s3.amazonaws.com/aws-cli/awscli-bundle-${AWS_CLI_VERSION}.zip -O /tmp/awscli-bundle-${AWS_CLI_VERSION}.zip \
7474
&& echo "${AWS_CLI_CHECKSUM} awscli-bundle-${AWS_CLI_VERSION}.zip" > /tmp/SHA256SUM \
75-
&& sha256sum -c SHA256SUM \
75+
&& ( cd /tmp; sha256sum -c SHA256SUM || ( echo "Expected $(sha256sum awscli-bundle-${AWS_CLI_VERSION}.zip)"; exit 1; )) \
7676
&& unzip awscli-bundle-${AWS_CLI_VERSION}.zip \
7777
&& /tmp/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws \
7878
&& apk del wget \
79+
&& rm -rf /var/cache/apk/* \
7980
&& rm -rf /tmp/* \
8081
;
8182

tests/test_functions.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TOOLBOX_IMAGE="panubo/postgres-toolbox:latest"
2-
POSTGRES_TARGET_VERSION="12.7"
2+
POSTGRES_TARGET_VERSION="14.7"
33

44
diag() {
55
echo "$@" | sed -e 's/^/# /' >&3 ;

0 commit comments

Comments
 (0)