Merge pull request #4895 from duncdrum/fix-docker

Fix docker builds
eXist-db · May 3, 2023 · 45790db · 45790db
2 parents 9f02d3a + 9475655
commit 45790db
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml
@@ -60,12 +60,12 @@ jobs:
  run: mvn -q -Ddocker.tag=release -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
  working-directory: ./exist-docker
  # NOTE (DP): This is for debugging, publishes an experimental image from inside PRs against develop
- # - name: Publish experimental images
- #  if: github.base_ref == 'develop'
- #  env:
- #  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- #  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
- #  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
- # run: mvn -Ddocker.tag=experimental -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
- #  working-directory: ./exist-docker 
+ - name: Publish experimental images
+ if: github.base_ref == 'develop'
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+ DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  run: mvn -q -Ddocker.tag=experimental -Ddocker.username=$DOCKER_USERNAME -Ddocker.password=$DOCKER_PASSWORD docker:build docker:push
+ working-directory: ./exist-docker 
 
diff --git a/exist-docker/src/main/resources-filtered/Dockerfile b/exist-docker/src/main/resources-filtered/Dockerfile
@@ -21,24 +21,24 @@
 #
 
 # Use Debian Bullseye (which is the base of gcr.io/distroless/java:17) for additional library dependencies that we need
-FROM debian:bullseye-slim as debian-slim
-RUN apt-get update && apt-get -y dist-upgrade
-RUN apt-get install -y openjdk-17-jre-headless
-RUN apt-get install -y expat fontconfig # Install tools required by FOP
+# FROM debian:bullseye-slim as debian-slim
+# RUN apt-get update && apt-get -y dist-upgrade
+# RUN apt-get install -y openjdk-17-jre-headless
+# RUN apt-get install -y expat fontconfig # Install tools required by FOP
 
 FROM gcr.io/distroless/java17:latest
 
 # Copy over dependencies for Apache FOP, missing from GCR's JRE
-COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libfreetype.so.6 /usr/lib/x86_64-linux-gnu/libfreetype.so.6
-COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/liblcms2.so.2 /usr/lib/x86_64-linux-gnu/liblcms2.so.2
-COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libpng16.so.16 /usr/lib/x86_64-linux-gnu/libpng16.so.16
-COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1
+# COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libfreetype.so.6 /usr/lib/x86_64-linux-gnu/libfreetype.so.6
+# COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/liblcms2.so.2 /usr/lib/x86_64-linux-gnu/liblcms2.so.2
+# COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libpng16.so.16 /usr/lib/x86_64-linux-gnu/libpng16.so.16
+# COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1
 
 # Copy dependencies for Apache Batik (used by Apache FOP to handle SVG rendering)
-COPY --from=debian-slim /etc/fonts /etc/fonts
-COPY --from=debian-slim /lib/x86_64-linux-gnu/libexpat.so.1 /lib/x86_64-linux-gnu/libexpat.so.1
-COPY --from=debian-slim /usr/share/fontconfig /usr/share/fontconfig
-COPY --from=debian-slim /usr/share/fonts/truetype/dejavu /usr/share/fonts/truetype/dejavu
+# COPY --from=debian-slim /etc/fonts /etc/fonts
+# COPY --from=debian-slim /lib/x86_64-linux-gnu/libexpat.so.1 /lib/x86_64-linux-gnu/libexpat.so.1
+# COPY --from=debian-slim /usr/share/fontconfig /usr/share/fontconfig
+# COPY --from=debian-slim /usr/share/fonts/truetype/dejavu /usr/share/fonts/truetype/dejavu
 
 # Copy eXist-db
 COPY LICENSE /exist/LICENSE