diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index a5ff1fb3d..26a8d4afe 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -99,7 +99,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index 3273c695e..07c450d4f 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -99,7 +99,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/noble/Dockerfile b/11/jdk/ubuntu/noble/Dockerfile index 1c2659733..a79c18167 100644 --- a/11/jdk/ubuntu/noble/Dockerfile +++ b/11/jdk/ubuntu/noble/Dockerfile @@ -99,7 +99,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index 05dd05882..116018fbf 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index da6e922d2..aa84b521e 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/noble/Dockerfile b/11/jre/ubuntu/noble/Dockerfile index d7ea8cd10..5227d1de0 100644 --- a/11/jre/ubuntu/noble/Dockerfile +++ b/11/jre/ubuntu/noble/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index 883eba3ae..d5badb55d 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -102,7 +102,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index 9c1e5659d..f8b8fc4a2 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -102,7 +102,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/noble/Dockerfile b/17/jdk/ubuntu/noble/Dockerfile index 85af0245e..e2b2ec686 100644 --- a/17/jdk/ubuntu/noble/Dockerfile +++ b/17/jdk/ubuntu/noble/Dockerfile @@ -102,7 +102,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index ca09f57d1..ca9a85d61 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index ea23314dc..a50ecdce3 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/noble/Dockerfile b/17/jre/ubuntu/noble/Dockerfile index 470704dc3..79aaede64 100644 --- a/17/jre/ubuntu/noble/Dockerfile +++ b/17/jre/ubuntu/noble/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index c6c47a9e2..a900185fe 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -98,7 +98,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jdk/ubuntu/noble/Dockerfile b/21/jdk/ubuntu/noble/Dockerfile index 34d5ed501..c83c20c41 100644 --- a/21/jdk/ubuntu/noble/Dockerfile +++ b/21/jdk/ubuntu/noble/Dockerfile @@ -98,7 +98,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index e742ff7a5..71eab15a2 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -93,5 +93,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubuntu/noble/Dockerfile b/21/jre/ubuntu/noble/Dockerfile index e4c9aea2e..2e99f5145 100644 --- a/21/jre/ubuntu/noble/Dockerfile +++ b/21/jre/ubuntu/noble/Dockerfile @@ -93,5 +93,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jdk/ubuntu/jammy/Dockerfile b/22/jdk/ubuntu/jammy/Dockerfile index c84a284bb..d29358fe9 100644 --- a/22/jdk/ubuntu/jammy/Dockerfile +++ b/22/jdk/ubuntu/jammy/Dockerfile @@ -96,7 +96,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jdk/ubuntu/noble/Dockerfile b/22/jdk/ubuntu/noble/Dockerfile index f14dc616a..1927ebd54 100644 --- a/22/jdk/ubuntu/noble/Dockerfile +++ b/22/jdk/ubuntu/noble/Dockerfile @@ -96,7 +96,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jre/ubuntu/jammy/Dockerfile b/22/jre/ubuntu/jammy/Dockerfile index 0228acd15..de9e9f102 100644 --- a/22/jre/ubuntu/jammy/Dockerfile +++ b/22/jre/ubuntu/jammy/Dockerfile @@ -91,5 +91,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jre/ubuntu/noble/Dockerfile b/22/jre/ubuntu/noble/Dockerfile index c670d2efd..c097d5e53 100644 --- a/22/jre/ubuntu/noble/Dockerfile +++ b/22/jre/ubuntu/noble/Dockerfile @@ -91,5 +91,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index ba34423fa..3e926ec3c 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -95,5 +95,5 @@ RUN set -eux; \ echo "javac -version"; javac -version; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index 29d2a97f7..0257bc97f 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -95,5 +95,5 @@ RUN set -eux; \ echo "javac -version"; javac -version; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/noble/Dockerfile b/8/jdk/ubuntu/noble/Dockerfile index f5e3abf0c..3c07738f8 100644 --- a/8/jdk/ubuntu/noble/Dockerfile +++ b/8/jdk/ubuntu/noble/Dockerfile @@ -95,5 +95,5 @@ RUN set -eux; \ echo "javac -version"; javac -version; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index 9582c86de..f60c8af7d 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -94,5 +94,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index 33283f75b..2955bb3cb 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -94,5 +94,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/noble/Dockerfile b/8/jre/ubuntu/noble/Dockerfile index c792a37c9..4ab3b8c26 100644 --- a/8/jre/ubuntu/noble/Dockerfile +++ b/8/jre/ubuntu/noble/Dockerfile @@ -94,5 +94,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/docker_templates/alpine-linux.Dockerfile.j2 b/docker_templates/alpine-linux.Dockerfile.j2 index 513f3490d..81d127479 100644 --- a/docker_templates/alpine-linux.Dockerfile.j2 +++ b/docker_templates/alpine-linux.Dockerfile.j2 @@ -30,6 +30,5 @@ ENV JAVA_VERSION {{ java_version }} {% include 'partials/multi-arch-install.j2' %} {% include 'partials/version-check.j2' %} -COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +{% include 'partials/entrypoint.j2' %} {% include 'partials/jshell.j2' %} diff --git a/docker_templates/partials/entrypoint.j2 b/docker_templates/partials/entrypoint.j2 new file mode 100644 index 000000000..d5a6bf190 --- /dev/null +++ b/docker_templates/partials/entrypoint.j2 @@ -0,0 +1,2 @@ +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] \ No newline at end of file diff --git a/docker_templates/ubi9-minimal.Dockerfile.j2 b/docker_templates/ubi9-minimal.Dockerfile.j2 index 454d89b06..05e6ff267 100644 --- a/docker_templates/ubi9-minimal.Dockerfile.j2 +++ b/docker_templates/ubi9-minimal.Dockerfile.j2 @@ -28,6 +28,5 @@ ENV JAVA_VERSION {{ java_version }} {% include 'partials/multi-arch-install.j2' %} {% include 'partials/version-check.j2' %} -COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +{% include 'partials/entrypoint.j2' %} {% include 'partials/jshell.j2' %} diff --git a/docker_templates/ubuntu.Dockerfile.j2 b/docker_templates/ubuntu.Dockerfile.j2 index 1167477b8..81f164455 100644 --- a/docker_templates/ubuntu.Dockerfile.j2 +++ b/docker_templates/ubuntu.Dockerfile.j2 @@ -42,6 +42,5 @@ ENV JAVA_VERSION {{ java_version }} ldconfig; {% endif %} {% include 'partials/version-check.j2' %} -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +{% include 'partials/entrypoint.j2' %} {% include 'partials/jshell.j2' %}