-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
eclipse-temurin: Support the use system cacerts as an option #15162
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pushing out for the remaining versions
Diff for f6e6319:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 476d3be..61d11ff 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,26 +3,26 @@ GitRepo: https://github.com/adoptium/containers.git
GitFetch: refs/heads/main
Tags: 8u382-b05-jdk-alpine, 8-jdk-alpine, 8-alpine
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jdk/alpine
File: Dockerfile.releases.full
Tags: 8u382-b05-jdk-centos7, 8-jdk-centos7, 8-centos7
Architectures: amd64, arm64v8, ppc64le
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jdk/centos
File: Dockerfile.releases.full
Tags: 8u382-b05-jdk-focal, 8-jdk-focal, 8-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jdk/ubuntu/focal
File: Dockerfile.releases.full
Tags: 8u382-b05-jdk-jammy, 8-jdk-jammy, 8-jammy
SharedTags: 8u382-b05-jdk, 8-jdk, 8
Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jdk/ubuntu/jammy
File: Dockerfile.releases.full
@@ -44,7 +44,7 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 8u382-b05-jdk-ubi9-minimal, 8-jdk-ubi9-minimal, 8-ubi9-minimal
Architectures: amd64, arm64v8, ppc64le
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jdk/ubi/ubi9-minimal
File: Dockerfile.releases.full
@@ -65,26 +65,26 @@ File: Dockerfile.releases.full
Constraints: windowsservercore-ltsc2022
Tags: 8u382-b05-jre-alpine, 8-jre-alpine
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jre/alpine
File: Dockerfile.releases.full
Tags: 8u382-b05-jre-centos7, 8-jre-centos7
Architectures: amd64, arm64v8, ppc64le
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jre/centos
File: Dockerfile.releases.full
Tags: 8u382-b05-jre-focal, 8-jre-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jre/ubuntu/focal
File: Dockerfile.releases.full
Tags: 8u382-b05-jre-jammy, 8-jre-jammy
SharedTags: 8u382-b05-jre, 8-jre
Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jre/ubuntu/jammy
File: Dockerfile.releases.full
@@ -106,7 +106,7 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 8u382-b05-jre-ubi9-minimal, 8-jre-ubi9-minimal
Architectures: amd64, arm64v8, ppc64le
-GitCommit: a076df4eb8dd8a60f52fbb60d9adc8e5f86c8b1a
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 8/jre/ubi/ubi9-minimal
File: Dockerfile.releases.full
@@ -127,26 +127,26 @@ File: Dockerfile.releases.full
Constraints: windowsservercore-ltsc2022
Tags: 11.0.20_8-jdk-alpine, 11-jdk-alpine, 11-alpine
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jdk/alpine
File: Dockerfile.releases.full
Tags: 11.0.20_8-jdk-centos7, 11-jdk-centos7, 11-centos7
Architectures: amd64, arm64v8, ppc64le
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jdk/centos
File: Dockerfile.releases.full
Tags: 11.0.20_8-jdk-focal, 11-jdk-focal, 11-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jdk/ubuntu/focal
File: Dockerfile.releases.full
Tags: 11.0.20_8-jdk-jammy, 11-jdk-jammy, 11-jammy
SharedTags: 11.0.20_8-jdk, 11-jdk, 11
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jdk/ubuntu/jammy
File: Dockerfile.releases.full
@@ -168,7 +168,7 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 11.0.20_8-jdk-ubi9-minimal, 11-jdk-ubi9-minimal, 11-ubi9-minimal
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jdk/ubi/ubi9-minimal
File: Dockerfile.releases.full
@@ -189,26 +189,26 @@ File: Dockerfile.releases.full
Constraints: windowsservercore-ltsc2022
Tags: 11.0.20_8-jre-alpine, 11-jre-alpine
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jre/alpine
File: Dockerfile.releases.full
Tags: 11.0.20_8-jre-centos7, 11-jre-centos7
Architectures: amd64, arm64v8, ppc64le
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jre/centos
File: Dockerfile.releases.full
Tags: 11.0.20_8-jre-focal, 11-jre-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jre/ubuntu/focal
File: Dockerfile.releases.full
Tags: 11.0.20_8-jre-jammy, 11-jre-jammy
SharedTags: 11.0.20_8-jre, 11-jre
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jre/ubuntu/jammy
File: Dockerfile.releases.full
@@ -230,7 +230,7 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 11.0.20_8-jre-ubi9-minimal, 11-jre-ubi9-minimal
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 7b6ee5b8da666343ab1169d6019833a94ef6eb6d
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 11/jre/ubi/ubi9-minimal
File: Dockerfile.releases.full
@@ -251,26 +251,26 @@ File: Dockerfile.releases.full
Constraints: windowsservercore-ltsc2022
Tags: 17.0.8_7-jdk-alpine, 17-jdk-alpine, 17-alpine
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jdk/alpine
File: Dockerfile.releases.full
Tags: 17.0.8_7-jdk-centos7, 17-jdk-centos7, 17-centos7
Architectures: amd64, arm64v8, ppc64le
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jdk/centos
File: Dockerfile.releases.full
Tags: 17.0.8_7-jdk-focal, 17-jdk-focal, 17-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jdk/ubuntu/focal
File: Dockerfile.releases.full
Tags: 17.0.8_7-jdk-jammy, 17-jdk-jammy, 17-jammy
SharedTags: 17.0.8_7-jdk, 17-jdk, 17
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jdk/ubuntu/jammy
File: Dockerfile.releases.full
@@ -292,7 +292,7 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 17.0.8_7-jdk-ubi9-minimal, 17-jdk-ubi9-minimal, 17-ubi9-minimal
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jdk/ubi/ubi9-minimal
File: Dockerfile.releases.full
@@ -313,26 +313,26 @@ File: Dockerfile.releases.full
Constraints: windowsservercore-ltsc2022
Tags: 17.0.8_7-jre-alpine, 17-jre-alpine
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jre/alpine
File: Dockerfile.releases.full
Tags: 17.0.8_7-jre-centos7, 17-jre-centos7
Architectures: amd64, arm64v8, ppc64le
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jre/centos
File: Dockerfile.releases.full
Tags: 17.0.8_7-jre-focal, 17-jre-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jre/ubuntu/focal
File: Dockerfile.releases.full
Tags: 17.0.8_7-jre-jammy, 17-jre-jammy
SharedTags: 17.0.8_7-jre, 17-jre
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jre/ubuntu/jammy
File: Dockerfile.releases.full
@@ -354,7 +354,7 @@ Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
Tags: 17.0.8_7-jre-ubi9-minimal, 17-jre-ubi9-minimal
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 2eabe3e4525f57d9d4e85af796fca2a2748fe907
+GitCommit: 05b7f082746228466ceacf43dd0c21e9a0ba2b84
Directory: 17/jre/ubi/ubi9-minimal
File: Dockerfile.releases.full
diff --git a/eclipse-temurin_11-alpine/Dockerfile.releases.full b/eclipse-temurin_11-alpine/Dockerfile.releases.full
index 67675ce..eacb30f 100644
--- a/eclipse-temurin_11-alpine/Dockerfile.releases.full
+++ b/eclipse-temurin_11-alpine/Dockerfile.releases.full
@@ -26,7 +26,8 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
# fontconfig and ttf-dejavu added to support serverside image generation by Java programs
-RUN apk add --no-cache fontconfig libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
+# java-cacerts added to support adding CA certificates to the Java keystore
+RUN apk add --no-cache fontconfig java-cacerts libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
&& rm -rf /var/cache/apk/*
ENV JAVA_VERSION jdk-11.0.20+8
@@ -59,5 +60,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_11-alpine/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_11-alpine/entrypoint.sh
diff --git a/eclipse-temurin_11-centos7/Dockerfile.releases.full b/eclipse-temurin_11-centos7/Dockerfile.releases.full
index e2ee14d..95002f9 100644
--- a/eclipse-temurin_11-centos7/Dockerfile.releases.full
+++ b/eclipse-temurin_11-centos7/Dockerfile.releases.full
@@ -66,5 +66,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_11-centos7/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_11-centos7/entrypoint.sh
diff --git a/eclipse-temurin_11-focal/Dockerfile.releases.full b/eclipse-temurin_11-focal/Dockerfile.releases.full
index c67c50f..d46cae0 100644
--- a/eclipse-temurin_11-focal/Dockerfile.releases.full
+++ b/eclipse-temurin_11-focal/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -83,5 +83,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_11-focal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_11-focal/entrypoint.sh
diff --git a/eclipse-temurin_11-jammy/Dockerfile.releases.full b/eclipse-temurin_11-jammy/Dockerfile.releases.full
index d657b47..4a9d7c5 100644
--- a/eclipse-temurin_11-jammy/Dockerfile.releases.full
+++ b/eclipse-temurin_11-jammy/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -83,5 +83,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_11-jammy/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_11-jammy/entrypoint.sh
diff --git a/eclipse-temurin_11-jre-alpine/Dockerfile.releases.full b/eclipse-temurin_11-jre-alpine/Dockerfile.releases.full
index 4646810..0b2ab94 100644
--- a/eclipse-temurin_11-jre-alpine/Dockerfile.releases.full
+++ b/eclipse-temurin_11-jre-alpine/Dockerfile.releases.full
@@ -26,7 +26,8 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
# fontconfig and ttf-dejavu added to support serverside image generation by Java programs
-RUN apk add --no-cache fontconfig libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
+# java-cacerts added to support adding CA certificates to the Java keystore
+RUN apk add --no-cache fontconfig java-cacerts libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
&& rm -rf /var/cache/apk/*
ENV JAVA_VERSION jdk-11.0.20+8
@@ -58,3 +59,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_11-jre-alpine/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_11-jre-alpine/entrypoint.sh
diff --git a/eclipse-temurin_11-jre-centos7/Dockerfile.releases.full b/eclipse-temurin_11-jre-centos7/Dockerfile.releases.full
index 88ef08d..9d55184 100644
--- a/eclipse-temurin_11-jre-centos7/Dockerfile.releases.full
+++ b/eclipse-temurin_11-jre-centos7/Dockerfile.releases.full
@@ -65,3 +65,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_11-jre-centos7/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_11-jre-centos7/entrypoint.sh
diff --git a/eclipse-temurin_11-jre-focal/Dockerfile.releases.full b/eclipse-temurin_11-jre-focal/Dockerfile.releases.full
index 6c3b350..545a4d2 100644
--- a/eclipse-temurin_11-jre-focal/Dockerfile.releases.full
+++ b/eclipse-temurin_11-jre-focal/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -82,3 +82,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_11-jre-focal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_11-jre-focal/entrypoint.sh
diff --git a/eclipse-temurin_11-jre-jammy/Dockerfile.releases.full b/eclipse-temurin_11-jre-jammy/Dockerfile.releases.full
index abc4931..8f1b1b1 100644
--- a/eclipse-temurin_11-jre-jammy/Dockerfile.releases.full
+++ b/eclipse-temurin_11-jre-jammy/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -82,3 +82,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_11-jre-jammy/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_11-jre-jammy/entrypoint.sh
diff --git a/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile.releases.full b/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile.releases.full
index 5019dc4..e9a2e01 100644
--- a/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile.releases.full
+++ b/eclipse-temurin_11-jre-ubi9-minimal/Dockerfile.releases.full
@@ -69,3 +69,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_11-jre-ubi9-minimal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_11-jre-ubi9-minimal/entrypoint.sh
diff --git a/eclipse-temurin_11-ubi9-minimal/Dockerfile.releases.full b/eclipse-temurin_11-ubi9-minimal/Dockerfile.releases.full
index c10b50d..3a9931c 100644
--- a/eclipse-temurin_11-ubi9-minimal/Dockerfile.releases.full
+++ b/eclipse-temurin_11-ubi9-minimal/Dockerfile.releases.full
@@ -70,5 +70,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_11-ubi9-minimal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_11-ubi9-minimal/entrypoint.sh
diff --git a/eclipse-temurin_17-alpine/Dockerfile.releases.full b/eclipse-temurin_17-alpine/Dockerfile.releases.full
index 4cf6730..0618509 100644
--- a/eclipse-temurin_17-alpine/Dockerfile.releases.full
+++ b/eclipse-temurin_17-alpine/Dockerfile.releases.full
@@ -26,7 +26,8 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
# fontconfig and ttf-dejavu added to support serverside image generation by Java programs
-RUN apk add --no-cache fontconfig libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
+# java-cacerts added to support adding CA certificates to the Java keystore
+RUN apk add --no-cache fontconfig java-cacerts libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
&& rm -rf /var/cache/apk/*
ENV JAVA_VERSION jdk-17.0.8+7
@@ -59,5 +60,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_17-alpine/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_17-alpine/entrypoint.sh
diff --git a/eclipse-temurin_17-centos7/Dockerfile.releases.full b/eclipse-temurin_17-centos7/Dockerfile.releases.full
index e171a91..f80e36b 100644
--- a/eclipse-temurin_17-centos7/Dockerfile.releases.full
+++ b/eclipse-temurin_17-centos7/Dockerfile.releases.full
@@ -66,5 +66,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_17-centos7/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_17-centos7/entrypoint.sh
diff --git a/eclipse-temurin_17-focal/Dockerfile.releases.full b/eclipse-temurin_17-focal/Dockerfile.releases.full
index e7980ac..4b3d678 100644
--- a/eclipse-temurin_17-focal/Dockerfile.releases.full
+++ b/eclipse-temurin_17-focal/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales binutils \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -83,5 +83,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_17-focal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_17-focal/entrypoint.sh
diff --git a/eclipse-temurin_17-jammy/Dockerfile.releases.full b/eclipse-temurin_17-jammy/Dockerfile.releases.full
index 8b02876..cac02fe 100644
--- a/eclipse-temurin_17-jammy/Dockerfile.releases.full
+++ b/eclipse-temurin_17-jammy/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales binutils \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -83,5 +83,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_17-jammy/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_17-jammy/entrypoint.sh
diff --git a/eclipse-temurin_17-jre-alpine/Dockerfile.releases.full b/eclipse-temurin_17-jre-alpine/Dockerfile.releases.full
index fb92e21..9f14b79 100644
--- a/eclipse-temurin_17-jre-alpine/Dockerfile.releases.full
+++ b/eclipse-temurin_17-jre-alpine/Dockerfile.releases.full
@@ -26,7 +26,8 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
# fontconfig and ttf-dejavu added to support serverside image generation by Java programs
-RUN apk add --no-cache fontconfig libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
+# java-cacerts added to support adding CA certificates to the Java keystore
+RUN apk add --no-cache fontconfig java-cacerts libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
&& rm -rf /var/cache/apk/*
ENV JAVA_VERSION jdk-17.0.8+7
@@ -58,3 +59,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_17-jre-alpine/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_17-jre-alpine/entrypoint.sh
diff --git a/eclipse-temurin_17-jre-centos7/Dockerfile.releases.full b/eclipse-temurin_17-jre-centos7/Dockerfile.releases.full
index 95069df..1670a99 100644
--- a/eclipse-temurin_17-jre-centos7/Dockerfile.releases.full
+++ b/eclipse-temurin_17-jre-centos7/Dockerfile.releases.full
@@ -65,3 +65,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_17-jre-centos7/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_17-jre-centos7/entrypoint.sh
diff --git a/eclipse-temurin_17-jre-focal/Dockerfile.releases.full b/eclipse-temurin_17-jre-focal/Dockerfile.releases.full
index fde3f84..6af4822 100644
--- a/eclipse-temurin_17-jre-focal/Dockerfile.releases.full
+++ b/eclipse-temurin_17-jre-focal/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales binutils \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -82,3 +82,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_17-jre-focal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_17-jre-focal/entrypoint.sh
diff --git a/eclipse-temurin_17-jre-jammy/Dockerfile.releases.full b/eclipse-temurin_17-jre-jammy/Dockerfile.releases.full
index a48e41d..54fa157 100644
--- a/eclipse-temurin_17-jre-jammy/Dockerfile.releases.full
+++ b/eclipse-temurin_17-jre-jammy/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales binutils \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -82,3 +82,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_17-jre-jammy/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_17-jre-jammy/entrypoint.sh
diff --git a/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile.releases.full b/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile.releases.full
index 75dee46..c04a5d3 100644
--- a/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile.releases.full
+++ b/eclipse-temurin_17-jre-ubi9-minimal/Dockerfile.releases.full
@@ -69,3 +69,5 @@ RUN echo Verifying install ... \
&& fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_17-jre-ubi9-minimal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_17-jre-ubi9-minimal/entrypoint.sh
diff --git a/eclipse-temurin_17-ubi9-minimal/Dockerfile.releases.full b/eclipse-temurin_17-ubi9-minimal/Dockerfile.releases.full
index 989e257..0e06f90 100644
--- a/eclipse-temurin_17-ubi9-minimal/Dockerfile.releases.full
+++ b/eclipse-temurin_17-ubi9-minimal/Dockerfile.releases.full
@@ -70,5 +70,7 @@ RUN echo Verifying install ... \
&& echo javac --version && javac --version \
&& echo java --version && java --version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
CMD ["jshell"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_17-ubi9-minimal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_17-ubi9-minimal/entrypoint.sh
diff --git a/eclipse-temurin_8-alpine/Dockerfile.releases.full b/eclipse-temurin_8-alpine/Dockerfile.releases.full
index af6c5b4..210da72 100644
--- a/eclipse-temurin_8-alpine/Dockerfile.releases.full
+++ b/eclipse-temurin_8-alpine/Dockerfile.releases.full
@@ -26,7 +26,8 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
# fontconfig and ttf-dejavu added to support serverside image generation by Java programs
-RUN apk add --no-cache fontconfig libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
+# java-cacerts added to support adding CA certificates to the Java keystore
+RUN apk add --no-cache fontconfig java-cacerts libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
&& rm -rf /var/cache/apk/*
ENV JAVA_VERSION jdk8u382-b05
@@ -58,3 +59,5 @@ RUN echo Verifying install ... \
&& echo javac -version && javac -version \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_8-alpine/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_8-alpine/entrypoint.sh
diff --git a/eclipse-temurin_8-centos7/Dockerfile.releases.full b/eclipse-temurin_8-centos7/Dockerfile.releases.full
index 73b1bc9..7e0b71d 100644
--- a/eclipse-temurin_8-centos7/Dockerfile.releases.full
+++ b/eclipse-temurin_8-centos7/Dockerfile.releases.full
@@ -65,3 +65,5 @@ RUN echo Verifying install ... \
&& echo javac -version && javac -version \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_8-centos7/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_8-centos7/entrypoint.sh
diff --git a/eclipse-temurin_8-focal/Dockerfile.releases.full b/eclipse-temurin_8-focal/Dockerfile.releases.full
index f9d6687..5eeeeeb 100644
--- a/eclipse-temurin_8-focal/Dockerfile.releases.full
+++ b/eclipse-temurin_8-focal/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -79,3 +79,5 @@ RUN echo Verifying install ... \
&& echo javac -version && javac -version \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_8-focal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_8-focal/entrypoint.sh
diff --git a/eclipse-temurin_8-jammy/Dockerfile.releases.full b/eclipse-temurin_8-jammy/Dockerfile.releases.full
index 68b82f2..ebc11cb 100644
--- a/eclipse-temurin_8-jammy/Dockerfile.releases.full
+++ b/eclipse-temurin_8-jammy/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -79,3 +79,5 @@ RUN echo Verifying install ... \
&& echo javac -version && javac -version \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_8-jammy/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_8-jammy/entrypoint.sh
diff --git a/eclipse-temurin_8-jre-alpine/Dockerfile.releases.full b/eclipse-temurin_8-jre-alpine/Dockerfile.releases.full
index 6f280cb..5a53871 100644
--- a/eclipse-temurin_8-jre-alpine/Dockerfile.releases.full
+++ b/eclipse-temurin_8-jre-alpine/Dockerfile.releases.full
@@ -26,7 +26,8 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
# fontconfig and ttf-dejavu added to support serverside image generation by Java programs
-RUN apk add --no-cache fontconfig libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
+# java-cacerts added to support adding CA certificates to the Java keystore
+RUN apk add --no-cache fontconfig java-cacerts libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
&& rm -rf /var/cache/apk/*
ENV JAVA_VERSION jdk8u382-b05
@@ -57,3 +58,5 @@ RUN set -eux; \
RUN echo Verifying install ... \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_8-jre-alpine/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_8-jre-alpine/entrypoint.sh
diff --git a/eclipse-temurin_8-jre-centos7/Dockerfile.releases.full b/eclipse-temurin_8-jre-centos7/Dockerfile.releases.full
index e9e55f8..63aafc0 100644
--- a/eclipse-temurin_8-jre-centos7/Dockerfile.releases.full
+++ b/eclipse-temurin_8-jre-centos7/Dockerfile.releases.full
@@ -64,3 +64,5 @@ RUN set -eux; \
RUN echo Verifying install ... \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_8-jre-centos7/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_8-jre-centos7/entrypoint.sh
diff --git a/eclipse-temurin_8-jre-focal/Dockerfile.releases.full b/eclipse-temurin_8-jre-focal/Dockerfile.releases.full
index ccf3e19..13f33a2 100644
--- a/eclipse-temurin_8-jre-focal/Dockerfile.releases.full
+++ b/eclipse-temurin_8-jre-focal/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -78,3 +78,5 @@ RUN set -eux; \
RUN echo Verifying install ... \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_8-jre-focal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_8-jre-focal/entrypoint.sh
diff --git a/eclipse-temurin_8-jre-jammy/Dockerfile.releases.full b/eclipse-temurin_8-jre-jammy/Dockerfile.releases.full
index d01e056..ed10092 100644
--- a/eclipse-temurin_8-jre-jammy/Dockerfile.releases.full
+++ b/eclipse-temurin_8-jre-jammy/Dockerfile.releases.full
@@ -26,7 +26,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
RUN apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \
&& echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
@@ -78,3 +78,5 @@ RUN set -eux; \
RUN echo Verifying install ... \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-alpine/entrypoint.sh b/eclipse-temurin_8-jre-jammy/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-alpine/entrypoint.sh
copy to eclipse-temurin_8-jre-jammy/entrypoint.sh
diff --git a/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile.releases.full b/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile.releases.full
index a90069b..1b28d89 100644
--- a/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile.releases.full
+++ b/eclipse-temurin_8-jre-ubi9-minimal/Dockerfile.releases.full
@@ -64,3 +64,5 @@ RUN set -eux; \
RUN echo Verifying install ... \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_8-jre-ubi9-minimal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_8-jre-ubi9-minimal/entrypoint.sh
diff --git a/eclipse-temurin_8-ubi9-minimal/Dockerfile.releases.full b/eclipse-temurin_8-ubi9-minimal/Dockerfile.releases.full
index c560e05..ca60450 100644
--- a/eclipse-temurin_8-ubi9-minimal/Dockerfile.releases.full
+++ b/eclipse-temurin_8-ubi9-minimal/Dockerfile.releases.full
@@ -65,3 +65,5 @@ RUN echo Verifying install ... \
&& echo javac -version && javac -version \
&& echo java -version && java -version \
&& echo Complete.
+COPY entrypoint.sh /
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh b/eclipse-temurin_8-ubi9-minimal/entrypoint.sh
similarity index 100%
copy from eclipse-temurin_20-jre-ubi9-minimal/entrypoint.sh
copy to eclipse-temurin_8-ubi9-minimal/entrypoint.sh Relevant Maintainers: |
This was referenced Aug 11, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pushing out for the remaining versions