Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@gdams
gdams committed Oct 25, 2023
1 parent c0107d7 commit b336acf
Show file tree
Hide file tree
Showing 18 changed files with 8 additions and 21 deletions.
2 changes: 1 addition & 1 deletion 11/jdk/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN set -eux; \
exit 1; \
;; \
esac; \
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
mkdir -p "$JAVA_HOME"; \
tar --extract \
Expand Down
3 changes: 1 addition & 2 deletions 11/jre/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN set -eux; \
exit 1; \
;; \
esac; \
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
mkdir -p "$JAVA_HOME"; \
tar --extract \
Expand All @@ -58,7 +58,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 11/jre/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 11/jre/ubi/ubi9-minimal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 11/jre/ubuntu/focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 11/jre/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN set -eux; \
exit 1; \
;; \
esac; \
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
mkdir -p "$JAVA_HOME"; \
tar --extract \
Expand Down
3 changes: 1 addition & 2 deletions 17/jre/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ RUN set -eux; \
exit 1; \
;; \
esac; \
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
mkdir -p "$JAVA_HOME"; \
tar --extract \
Expand All @@ -58,7 +58,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 17/jre/centos/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 17/jre/ubi/ubi9-minimal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 17/jre/ubuntu/focal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 17/jre/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RUN set -eux; \
exit 1; \
;; \
esac; \
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
mkdir -p "$JAVA_HOME"; \
tar --extract \
Expand Down
3 changes: 1 addition & 2 deletions 21/jre/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ RUN set -eux; \
exit 1; \
;; \
esac; \
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
mkdir -p "$JAVA_HOME"; \
tar --extract \
Expand All @@ -62,7 +62,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 21/jre/ubi/ubi9-minimal/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
1 change: 0 additions & 1 deletion 21/jre/ubuntu/jammy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ RUN set -eux; \

RUN set -eux; \
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 /__cacert_entrypoint.sh
Expand Down
2 changes: 1 addition & 1 deletion docker_templates/partials/multi-arch-install.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
exit 1; \
;; \
esac; \
wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
wget {% if os != "alpine-linux" %}--progress=dot:giga {% endif %}-O /tmp/openjdk.tar.gz ${BINARY_URL}; \
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
mkdir -p "$JAVA_HOME"; \
tar --extract \
Expand Down
2 changes: 1 addition & 1 deletion docker_templates/partials/version-check.j2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
RUN {% if os_family != "windows" %}set -eux; \
{% else %}{% endif %}echo "Verifying install ..."; \
{% if os_family != "windows" and version|int >= 11 -%}
{% if os_family != "windows" and image_type == "jdk" and version|int >= 11 -%}
fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
{% endif -%}
{% if image_type == "jdk" -%}
Expand Down

0 comments on commit b336acf

Please sign in to comment.