From b6818b8d03b62c908fa35f2f3ef28ef987a66613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Feb 2024 14:24:53 +0100 Subject: [PATCH] Add pg_dump 15 *and* 16 The fallback to 12 is no longer good enough --- Dockerfile | 2 +- Makefile.maker.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c211c88..d5cc82ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN addgroup -g 4200 appgroup \ # upgrade all installed packages to fix potential CVEs in advance # also remove apk package manager to hopefully remove dependency on OpenSSL 🤞 RUN apk upgrade --no-cache --no-progress \ - && apk add --no-cache --no-progress postgresql16-client curl jq \ + && apk add --no-cache --no-progress postgresql15-client postgresql16-client curl jq \ && apk add --no-cache --no-progress --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/community postgresql12-client \ && apk del --no-cache --no-progress apk-tools alpine-keys diff --git a/Makefile.maker.yaml b/Makefile.maker.yaml index 63bc8b76..6e6002b1 100644 --- a/Makefile.maker.yaml +++ b/Makefile.maker.yaml @@ -15,6 +15,7 @@ dockerfile: - "ENV ENV=/usr/bin/motd.sh" # `kubectl exec` is not a login shell, so we need to use this instead of /etc/profile or $HOME/.profile extraPackages: # for psql, pg_dump + - postgresql15-client - postgresql16-client # required for backup-tools.sh - curl