From 911f22ed4e36d3f09dcfb74a4d8dd3648a8f0e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Thu, 4 Jan 2024 14:07:39 +0100
Subject: [PATCH] Outsmart go-makefile-maker

---
 Dockerfile          | 3 ++-
 Makefile.maker.yaml | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1dfe6a12..116159d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,8 @@ RUN addgroup -g 4200 appgroup \
 # upgrade all installed packages to fix potential CVEs in advance
 # also remove apk package manager to hopefully remove dependecy on openssl 🤞
 RUN apk upgrade --no-cache --no-progress \
-  && apk add --no-cache --no-progress ca-certificates postgresql12-client postgresql15-client curl jq \
+  && apk add --no-cache --no-progress ca-certificates postgresql15-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
 
 COPY --from=builder /pkg/ /usr/
diff --git a/Makefile.maker.yaml b/Makefile.maker.yaml
index 346d1b48..fe141fca 100644
--- a/Makefile.maker.yaml
+++ b/Makefile.maker.yaml
@@ -15,11 +15,13 @@ 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
-    - postgresql12-client
     - postgresql15-client
     # required for backup-tools.sh
     - curl
     - jq
+    - "\\
+
+      \ \ && apk add --no-cache --no-progress --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/community postgresql12-client"
 
 golang:
   enableVendoring: true