Skip to content

Commit 9475655

Browse files
committed
🐞 fix(docker): delete extra layers
these are unnecessary close #4894
1 parent ac899aa commit 9475655

File tree

1 file changed

+12
-12
lines changed
  • exist-docker/src/main/resources-filtered

1 file changed

+12
-12
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@
2121
#
2222

2323
# Use Debian Bullseye (which is the base of gcr.io/distroless/java:17) for additional library dependencies that we need
24-
FROM debian:bullseye-slim as debian-slim
25-
RUN apt-get update && apt-get -y dist-upgrade
26-
RUN apt-get install -y openjdk-17-jre-headless
27-
RUN apt-get install -y expat fontconfig # Install tools required by FOP
24+
# FROM debian:bullseye-slim as debian-slim
25+
# RUN apt-get update && apt-get -y dist-upgrade
26+
# RUN apt-get install -y openjdk-17-jre-headless
27+
# RUN apt-get install -y expat fontconfig # Install tools required by FOP
2828

2929
FROM gcr.io/distroless/java17:latest
3030

3131
# Copy over dependencies for Apache FOP, missing from GCR's JRE
32-
COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libfreetype.so.6 /usr/lib/x86_64-linux-gnu/libfreetype.so.6
33-
COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/liblcms2.so.2 /usr/lib/x86_64-linux-gnu/liblcms2.so.2
34-
COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libpng16.so.16 /usr/lib/x86_64-linux-gnu/libpng16.so.16
35-
COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1
32+
# COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libfreetype.so.6 /usr/lib/x86_64-linux-gnu/libfreetype.so.6
33+
# COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/liblcms2.so.2 /usr/lib/x86_64-linux-gnu/liblcms2.so.2
34+
# COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libpng16.so.16 /usr/lib/x86_64-linux-gnu/libpng16.so.16
35+
# COPY --from=debian-slim /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 /usr/lib/x86_64-linux-gnu/libfontconfig.so.1
3636

3737
# Copy dependencies for Apache Batik (used by Apache FOP to handle SVG rendering)
38-
COPY --from=debian-slim /etc/fonts /etc/fonts
39-
COPY --from=debian-slim /lib/x86_64-linux-gnu/libexpat.so.1 /lib/x86_64-linux-gnu/libexpat.so.1
40-
COPY --from=debian-slim /usr/share/fontconfig /usr/share/fontconfig
41-
COPY --from=debian-slim /usr/share/fonts/truetype/dejavu /usr/share/fonts/truetype/dejavu
38+
# COPY --from=debian-slim /etc/fonts /etc/fonts
39+
# COPY --from=debian-slim /lib/x86_64-linux-gnu/libexpat.so.1 /lib/x86_64-linux-gnu/libexpat.so.1
40+
# COPY --from=debian-slim /usr/share/fontconfig /usr/share/fontconfig
41+
# COPY --from=debian-slim /usr/share/fonts/truetype/dejavu /usr/share/fonts/truetype/dejavu
4242

4343
# Copy eXist-db
4444
COPY LICENSE /exist/LICENSE

0 commit comments

Comments
 (0)