From bd809c94828c84bdde3ea50bf02b63d76ecbb334 Mon Sep 17 00:00:00 2001
From: duncdrum <d.paterson@me.com>
Date: Tue, 12 Nov 2024 13:02:36 +0100
Subject: [PATCH] [bugfix] workaround docker maven plugin issue

fixes #5450

see [docker maven plugin bug](https://github.com/fabric8io/docker-maven-plugin/issues/1835)
---
 .github/workflows/ci-deploy.yml                           | 6 +++++-
 exist-docker/pom.xml                                      | 2 ++
 exist-docker/src/main/resources-filtered/Dockerfile-DEBUG | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml
index d75ac5195f3..26ca3c4f0d6 100644
--- a/.github/workflows/ci-deploy.yml
+++ b/.github/workflows/ci-deploy.yml
@@ -32,7 +32,11 @@ jobs:
           key: deploy-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: deploy-${{ runner.os }}-maven
       - name: Install bats
-        run: sudo apt-get install bats    
+        run: sudo apt-get install bats
+        # Hack around #5450
+      - name: pull base image
+        run: |
+          docker pull --platform linux/amd64 --platform linux/arm64 gcr.io/distroless/java17-debian12:latest      
       - name: Build images
         run: mvn -V -B -q -Pdocker -DskipTests -Ddependency-check.skip=true -P !mac-dmg-on-unix,!installer,!concurrency-stress-tests,!micro-benchmarks,skip-build-dist-archives clean package
       - name: Check local images
diff --git a/exist-docker/pom.xml b/exist-docker/pom.xml
index d49f8e54d03..eb89bb1d1a5 100644
--- a/exist-docker/pom.xml
+++ b/exist-docker/pom.xml
@@ -227,6 +227,7 @@
                     <images>
                         <image>
                             <name>existdb/existdb:%v</name>
+                            <registry>registry.hub.docker.com</registry>
                             <alias>exist</alias>
                             <build>
                                 <buildx>
@@ -243,6 +244,7 @@
                         </image>
                         <image>
                             <name>existdb/existdb:%v-DEBUG</name>
+                            <registry>registry.hub.docker.com</registry>
                             <alias>exist-debug</alias>
                             <build>
                                 <buildx>
diff --git a/exist-docker/src/main/resources-filtered/Dockerfile-DEBUG b/exist-docker/src/main/resources-filtered/Dockerfile-DEBUG
index 17bf0239765..d68aa8b85e3 100644
--- a/exist-docker/src/main/resources-filtered/Dockerfile-DEBUG
+++ b/exist-docker/src/main/resources-filtered/Dockerfile-DEBUG
@@ -21,7 +21,7 @@
 #
 
 # Use JDK 17 in Debian Bullseye (as our production image gcr.io/distroless/java:17 is based on Debian Bullseye with just a JRE)
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 RUN apt-get update && apt-get -y dist-upgrade
 RUN apt-get install -y openjdk-17-jdk-headless
 RUN apt-get install -y expat fontconfig     # Install tools required by FOP