Skip to content

Commit 675143a

Browse files
committed
[bugfix] Make sure the latest TimeZone data is available to the JVM in Docker
1 parent 0d588de commit 675143a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ FROM cgr.dev/chainguard/wolfi-base AS builder
2424

2525
RUN apk update && apk upgrade
2626
# Install dependencies needed for JRE
27-
RUN apk add zlib libjpeg-turbo libpng lcms2 freetype ttf-dejavu fontconfig-config libfontconfig1 expat libuuid libbrotlicommon1 libbrotlidec1 libbrotlienc1 libcrypt1
27+
RUN apk add tzdata zlib libjpeg-turbo libpng lcms2 freetype ttf-dejavu fontconfig-config libfontconfig1 expat libuuid libbrotlicommon1 libbrotlidec1 libbrotlienc1 libcrypt1
2828
# Install latest CA certificates
2929
RUN apk add ca-certificates java-cacerts
3030
# Install latest JRE
@@ -34,6 +34,7 @@ RUN apk add openjdk-8-jre
3434
FROM cgr.dev/chainguard/glibc-dynamic:latest
3535

3636
# Copy over dependencies for updated JRE from Wolfi
37+
COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
3738
COPY --from=builder /lib/libz.so.1 /lib/libz.so.1
3839
COPY --from=builder /usr/lib/libjpeg.so.8 /usr/lib/libjpeg.so.8
3940
COPY --from=builder /usr/lib/libturbojpeg.so.0 /usr/lib/libturbojpeg.so.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ FROM cgr.dev/chainguard/wolfi-base
2424

2525
RUN apk update && apk upgrade
2626
# Install dependencies needed for JDK
27-
RUN apk add zlib libjpeg-turbo libpng lcms2 freetype ttf-dejavu fontconfig-config libfontconfig1 expat libuuid libbrotlicommon1 libbrotlidec1 libbrotlienc1 libcrypt1
27+
RUN apk add tzdata zlib libjpeg-turbo libpng lcms2 freetype ttf-dejavu fontconfig-config libfontconfig1 expat libuuid libbrotlicommon1 libbrotlidec1 libbrotlienc1 libcrypt1
2828
# Install latest CA certificates
2929
RUN apk add ca-certificates java-cacerts
3030
# Install latest JDK

0 commit comments

Comments
 (0)