Skip to content

Commit 6f55277

Browse files
committed
Update wal-g and enable arm64 image builds
1 parent 7dbaf84 commit 6f55277

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.github/workflows/multi-build-push-postgres.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
push: ${{ github.event_name != 'pull_request' }}
116116
cache-from: type=gha
117117
cache-to: type=gha,mode=max
118-
platforms: linux/amd64 # ,linux/arm64 # ARM builds are not supported, pglogical do not ship arm64 packages
118+
platforms: linux/amd64,linux/arm64
119119
tags: ${{ steps.meta.outputs.tags }}
120120
labels: ${{ steps.meta.outputs.labels }}
121121

@@ -219,6 +219,6 @@ jobs:
219219
# push: ${{ github.event_name != 'pull_request' }}
220220
# cache-from: type=gha
221221
# cache-to: type=gha,mode=max
222-
# platforms: linux/amd64 # ,linux/arm64 # ARM builds are not supported, pglogical do not ship arm64 packages
222+
# platforms: linux/amd64,linux/arm64
223223
# tags: ${{ steps.meta.outputs.tags }}
224224
# labels: ${{ steps.meta.outputs.labels }}

14-debian13/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ FROM docker.io/postgres:14-trixie
88

99
ENV POSTGIS_VERSION=3.1.8 POSTGIS_SHA256=54254fb57070ce44d1da9434f472e0a82df0ef24321c2b9a22c449f756e278e7
1010
ENV TIMESCALEDB_VERSION=2.5.2 TIMESCALEDB_SHA256=b1a20832189c22ce378f009f9a24ef1db61d7131f7f79bde74fdcde87bcf2d7c
11-
ENV WALG_VERSION=2.0.1 WALG_SHA256=2640cb9110e802bf971efdc9b7a35515af7757e06693bf5c81bd4915d8d42b9c
11+
ENV WALG_VERSION=3.0.7 WALG_AMD64_SHA256=76d51ed915165d45314bc947300b9d1776adb2d875d857f580a730fd6f66900e WALG_AARCH64_SHA256=fcf25aac732f66e77e121e9d287a08d8bf867c604b81cb6fcfff2d6c692d38c9
1212
ENV POSTGRES_INITDB_ARGS="--data-checksums"
1313

1414
# Install some system utils
@@ -55,10 +55,17 @@ RUN set -x \
5555
# Install WAL-G
5656
RUN set -x \
5757
&& DIR=$(mktemp -d) && cd ${DIR} \
58-
&& curl -sSf -L https://github.com/wal-g/wal-g/releases/download/v${WALG_VERSION}/wal-g-pg-ubuntu-20.04-amd64.tar.gz -o wal-g-pg-ubuntu-20.04-amd64.tar.gz \
59-
&& echo "${WALG_SHA256} wal-g-pg-ubuntu-20.04-amd64.tar.gz" | sha256sum -c - \
60-
&& tar -xzf wal-g-pg-ubuntu-20.04-amd64.tar.gz \
61-
&& cp wal-g-pg-ubuntu-20.04-amd64 /usr/local/bin/wal-g \
58+
&& if [ "$(uname -m)" = "x86_64" ] ; then \
59+
WALG_SHA256="${WALG_AMD64_SHA256}"; \
60+
WALG_ARCH="amd64"; \
61+
elif [ "$(uname -m)" = "aarch64" ]; then \
62+
WALG_SHA256="${WALG_AARCH64_SHA256}"; \
63+
WALG_ARCH="aarch64"; \
64+
fi \
65+
&& curl -sSf -L https://github.com/wal-g/wal-g/releases/download/v${WALG_VERSION}/wal-g-pg-ubuntu-22.04-${WALG_ARCH}.tar.gz -o wal-g-pg-ubuntu-22.04-${WALG_ARCH}.tar.gz \
66+
&& ( echo "${WALG_SHA256} wal-g-pg-ubuntu-22.04-${WALG_ARCH}.tar.gz" | sha256sum -c - || ( echo "Expected $(sha256sum wal-g-pg-ubuntu-22.04-${WALG_ARCH}.tar.gz)"; exit 1; )) \
67+
&& tar -xzf wal-g-pg-ubuntu-22.04-${WALG_ARCH}.tar.gz \
68+
&& cp wal-g-pg-ubuntu-22.04-${WALG_ARCH} /usr/local/bin/wal-g \
6269
&& rm -rf ${DIR} \
6370
;
6471

14-debian13/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ TS_VERSION_MINOR = $(shell sed -E 's/.*=[0-9]+\.([0-9]+).*/\1/' <<<"$(TS_VERSION
1414
TS_VERSION_PATCH = $(shell sed -E 's/.*=[0-9]+\.[0-9]+\.([0-9]+).*/\1/' <<<"$(TS_VERSION)")
1515

1616
build:
17-
docker build --platform linux/amd64 --pull -t $(REGISTRY)/$(IMAGE):$(TAG) .
17+
docker build --pull -t $(REGISTRY)/$(IMAGE):$(TAG) .
1818

1919
.env:
2020
touch .env

0 commit comments

Comments
 (0)