Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
@gdams
gdams committed Aug 9, 2024
1 parent 80bb984 commit 6c36dc0
Show file tree
Hide file tree
Showing 30 changed files with 57 additions and 58 deletions.
4 changes: 2 additions & 2 deletions 11/jdk/ubuntu/focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 11/jdk/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 11/jdk/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 11/jre/ubuntu/focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 11/jre/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 11/jre/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 17/jdk/ubuntu/focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 17/jdk/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 17/jdk/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 17/jre/ubuntu/focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 17/jre/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 17/jre/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 21/jdk/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 21/jdk/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 21/jre/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 21/jre/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 22/jdk/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 22/jdk/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 22/jre/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 22/jre/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 8/jdk/ubuntu/focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 8/jdk/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 8/jdk/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 8/jre/ubuntu/focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 8/jre/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions 8/jre/ubuntu/noble/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
3 changes: 1 addition & 2 deletions docker_templates/alpine-linux.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
2 changes: 2 additions & 0 deletions docker_templates/partials/entrypoint.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh
ENTRYPOINT ["/__cacert_entrypoint.sh"]
3 changes: 1 addition & 2 deletions docker_templates/ubi9-minimal.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}
3 changes: 1 addition & 2 deletions docker_templates/ubuntu.Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

0 comments on commit 6c36dc0

Please sign in to comment.