Skip to content

Commit e6ec2dc

Browse files
duncdrumline-o
authored andcommitted
[bugfix] workaround docker maven plugin issue
fixes eXist-db#5450 see [docker maven plugin bug](fabric8io/docker-maven-plugin#1835)
1 parent 72f3b0c commit e6ec2dc

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.github/workflows/ci-deploy.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ jobs:
3232
key: deploy-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
3333
restore-keys: deploy-${{ runner.os }}-maven
3434
- name: Install bats
35-
run: sudo apt-get install bats
35+
run: sudo apt-get install bats
36+
# Hack around #5450
37+
- name: pull base image
38+
run: |
39+
docker pull --platform linux/amd64 --platform linux/arm64 gcr.io/distroless/java17-debian12:latest
3640
- name: Build images
3741
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
3842
- name: Check local images

exist-docker/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
<images>
228228
<image>
229229
<name>existdb/existdb:%v</name>
230+
<registry>registry.hub.docker.com</registry>
230231
<alias>exist</alias>
231232
<build>
232233
<buildx>
@@ -243,6 +244,7 @@
243244
</image>
244245
<image>
245246
<name>existdb/existdb:%v-DEBUG</name>
247+
<registry>registry.hub.docker.com</registry>
246248
<alias>exist-debug</alias>
247249
<build>
248250
<buildx>

exist-docker/src/main/resources-filtered/Dockerfile-DEBUG

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#
2222

2323
# Use JDK 17 in Debian Bullseye (as our production image gcr.io/distroless/java:17 is based on Debian Bullseye with just a JRE)
24-
FROM debian:bullseye-slim
24+
FROM debian:bookworm-slim
2525
RUN apt-get update && apt-get -y dist-upgrade
2626
RUN apt-get install -y openjdk-17-jdk-headless
2727
RUN apt-get install -y expat fontconfig # Install tools required by FOP

0 commit comments

Comments
 (0)