Skip to content

Commit 55c440c

Browse files
authored
bump Alpine Linux to 3.21 and add support for pinning alpine versions (#704)
* bump Alpine Linux to 3.21 * force cleanup GNUPGHOME * pin alpine linux minor versions
1 parent 27e3b63 commit 55c440c

File tree

77 files changed

+2103
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2103
-51
lines changed

11/jdk/alpine/Dockerfile 11/jdk/alpine/3.20/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ RUN set -eux; \
6767
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
6868
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
6969
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
70-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
70+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
7171
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
7272
mkdir -p "$JAVA_HOME"; \
7373
tar --extract \
File renamed without changes.

11/jdk/alpine/3.21/Dockerfile

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# ------------------------------------------------------------------------------
2+
# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
# ------------------------------------------------------------------------------
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# https://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
20+
FROM alpine:3.21
21+
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
24+
25+
# Default to UTF-8 file.encoding
26+
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
27+
28+
RUN set -eux; \
29+
apk add --no-cache \
30+
# java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
31+
# java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
32+
# https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
33+
fontconfig ttf-dejavu \
34+
# gnupg required to verify the signature
35+
gnupg \
36+
# utilities for keeping Alpine and OpenJDK CA certificates in sync
37+
# https://github.com/adoptium/containers/issues/293
38+
ca-certificates p11-kit-trust \
39+
# locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8
40+
musl-locales musl-locales-lang \
41+
tzdata \
42+
# Contains `csplit` used for splitting multiple certificates in one file to multiple files, since keytool can
43+
# only import one at a time.
44+
coreutils \
45+
# Needed to extract CN and generate aliases for certificates
46+
openssl \
47+
; \
48+
rm -rf /var/cache/apk/*
49+
50+
ENV JAVA_VERSION=jdk-11.0.25+9
51+
52+
RUN set -eux; \
53+
ARCH="$(apk --print-arch)"; \
54+
case "${ARCH}" in \
55+
x86_64) \
56+
ESUM='0a431310ccccc36c85b1274b5d31e368fdc8cf62cb7c2ed98d7b59eb5a13dc82'; \
57+
BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.25_9.tar.gz'; \
58+
;; \
59+
*) \
60+
echo "Unsupported arch: ${ARCH}"; \
61+
exit 1; \
62+
;; \
63+
esac; \
64+
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
65+
wget -O /tmp/openjdk.tar.gz.sig ${BINARY_URL}.sig; \
66+
export GNUPGHOME="$(mktemp -d)"; \
67+
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
68+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
69+
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
70+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
71+
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
72+
mkdir -p "$JAVA_HOME"; \
73+
tar --extract \
74+
--file /tmp/openjdk.tar.gz \
75+
--directory "$JAVA_HOME" \
76+
--strip-components 1 \
77+
--no-same-owner \
78+
; \
79+
rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
80+
81+
RUN set -eux; \
82+
echo "Verifying install ..."; \
83+
fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
84+
echo "javac --version"; javac --version; \
85+
echo "java --version"; java --version; \
86+
echo "Complete."
87+
COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh
88+
ENTRYPOINT ["/__cacert_entrypoint.sh"]
89+
90+
CMD ["jshell"]
File renamed without changes.

11/jdk/ubi/ubi9-minimal/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN set -eux; \
7676
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
7777
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
7878
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
79-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
79+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8080
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8181
mkdir -p "$JAVA_HOME"; \
8282
tar --extract \

11/jdk/ubuntu/focal/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RUN set -eux; \
8484
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
8585
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
8686
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
87-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
87+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8888
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8989
mkdir -p "$JAVA_HOME"; \
9090
tar --extract \

11/jdk/ubuntu/jammy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RUN set -eux; \
8484
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
8585
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
8686
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
87-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
87+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8888
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8989
mkdir -p "$JAVA_HOME"; \
9090
tar --extract \

11/jdk/ubuntu/noble/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RUN set -eux; \
8484
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
8585
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
8686
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
87-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
87+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8888
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8989
mkdir -p "$JAVA_HOME"; \
9090
tar --extract \

11/jre/alpine/Dockerfile 11/jre/alpine/3.20/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ RUN set -eux; \
6767
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
6868
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
6969
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
70-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
70+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
7171
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
7272
mkdir -p "$JAVA_HOME"; \
7373
tar --extract \
File renamed without changes.

11/jre/alpine/3.21/Dockerfile

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# ------------------------------------------------------------------------------
2+
# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
# ------------------------------------------------------------------------------
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# https://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
20+
FROM alpine:3.21
21+
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
24+
25+
# Default to UTF-8 file.encoding
26+
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
27+
28+
RUN set -eux; \
29+
apk add --no-cache \
30+
# java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
31+
# java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
32+
# https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
33+
fontconfig ttf-dejavu \
34+
# gnupg required to verify the signature
35+
gnupg \
36+
# utilities for keeping Alpine and OpenJDK CA certificates in sync
37+
# https://github.com/adoptium/containers/issues/293
38+
ca-certificates p11-kit-trust \
39+
# locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8
40+
musl-locales musl-locales-lang \
41+
tzdata \
42+
# Contains `csplit` used for splitting multiple certificates in one file to multiple files, since keytool can
43+
# only import one at a time.
44+
coreutils \
45+
# Needed to extract CN and generate aliases for certificates
46+
openssl \
47+
; \
48+
rm -rf /var/cache/apk/*
49+
50+
ENV JAVA_VERSION=jdk-11.0.25+9
51+
52+
RUN set -eux; \
53+
ARCH="$(apk --print-arch)"; \
54+
case "${ARCH}" in \
55+
x86_64) \
56+
ESUM='905e35f14228904d67a7a56f9f0b8ede58e9b15f9af3a3d54fb86f78c8e47a34'; \
57+
BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.25_9.tar.gz'; \
58+
;; \
59+
*) \
60+
echo "Unsupported arch: ${ARCH}"; \
61+
exit 1; \
62+
;; \
63+
esac; \
64+
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
65+
wget -O /tmp/openjdk.tar.gz.sig ${BINARY_URL}.sig; \
66+
export GNUPGHOME="$(mktemp -d)"; \
67+
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
68+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
69+
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
70+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
71+
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
72+
mkdir -p "$JAVA_HOME"; \
73+
tar --extract \
74+
--file /tmp/openjdk.tar.gz \
75+
--directory "$JAVA_HOME" \
76+
--strip-components 1 \
77+
--no-same-owner \
78+
; \
79+
rm -f /tmp/openjdk.tar.gz;
80+
81+
RUN set -eux; \
82+
echo "Verifying install ..."; \
83+
echo "java --version"; java --version; \
84+
echo "Complete."
85+
COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh
86+
ENTRYPOINT ["/__cacert_entrypoint.sh"]
File renamed without changes.

11/jre/ubi/ubi9-minimal/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN set -eux; \
7676
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
7777
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
7878
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
79-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
79+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8080
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8181
mkdir -p "$JAVA_HOME"; \
8282
tar --extract \

11/jre/ubuntu/focal/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RUN set -eux; \
8484
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
8585
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
8686
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
87-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
87+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8888
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8989
mkdir -p "$JAVA_HOME"; \
9090
tar --extract \

11/jre/ubuntu/jammy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RUN set -eux; \
8484
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
8585
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
8686
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
87-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
87+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8888
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8989
mkdir -p "$JAVA_HOME"; \
9090
tar --extract \

11/jre/ubuntu/noble/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RUN set -eux; \
8484
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
8585
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
8686
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
87-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
87+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8888
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8989
mkdir -p "$JAVA_HOME"; \
9090
tar --extract \

17/jdk/alpine/Dockerfile 17/jdk/alpine/3.20/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ RUN set -eux; \
7070
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
7171
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
7272
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
73-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
73+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
7474
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
7575
mkdir -p "$JAVA_HOME"; \
7676
tar --extract \
File renamed without changes.

17/jdk/alpine/3.21/Dockerfile

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# ------------------------------------------------------------------------------
2+
# NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
# ------------------------------------------------------------------------------
6+
#
7+
# Licensed under the Apache License, Version 2.0 (the "License");
8+
# you may not use this file except in compliance with the License.
9+
# You may obtain a copy of the License at
10+
#
11+
# https://www.apache.org/licenses/LICENSE-2.0
12+
#
13+
# Unless required by applicable law or agreed to in writing, software
14+
# distributed under the License is distributed on an "AS IS" BASIS,
15+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
# See the License for the specific language governing permissions and
17+
# limitations under the License.
18+
#
19+
20+
FROM alpine:3.21
21+
22+
ENV JAVA_HOME=/opt/java/openjdk
23+
ENV PATH=$JAVA_HOME/bin:$PATH
24+
25+
# Default to UTF-8 file.encoding
26+
ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
27+
28+
RUN set -eux; \
29+
apk add --no-cache \
30+
# java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
31+
# java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
32+
# https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
33+
fontconfig ttf-dejavu \
34+
# gnupg required to verify the signature
35+
gnupg \
36+
# utilities for keeping Alpine and OpenJDK CA certificates in sync
37+
# https://github.com/adoptium/containers/issues/293
38+
ca-certificates p11-kit-trust \
39+
# locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8
40+
musl-locales musl-locales-lang \
41+
# jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351
42+
# Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory
43+
binutils \
44+
tzdata \
45+
# Contains `csplit` used for splitting multiple certificates in one file to multiple files, since keytool can
46+
# only import one at a time.
47+
coreutils \
48+
# Needed to extract CN and generate aliases for certificates
49+
openssl \
50+
; \
51+
rm -rf /var/cache/apk/*
52+
53+
ENV JAVA_VERSION=jdk-17.0.13+11
54+
55+
RUN set -eux; \
56+
ARCH="$(apk --print-arch)"; \
57+
case "${ARCH}" in \
58+
x86_64) \
59+
ESUM='67632ee4563e9827b56f62ab6da95bce200d9e82092b211988c0d2113abc4071'; \
60+
BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.13_11.tar.gz'; \
61+
;; \
62+
*) \
63+
echo "Unsupported arch: ${ARCH}"; \
64+
exit 1; \
65+
;; \
66+
esac; \
67+
wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
68+
wget -O /tmp/openjdk.tar.gz.sig ${BINARY_URL}.sig; \
69+
export GNUPGHOME="$(mktemp -d)"; \
70+
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
71+
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
72+
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
73+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
74+
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
75+
mkdir -p "$JAVA_HOME"; \
76+
tar --extract \
77+
--file /tmp/openjdk.tar.gz \
78+
--directory "$JAVA_HOME" \
79+
--strip-components 1 \
80+
--no-same-owner \
81+
; \
82+
rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
83+
84+
RUN set -eux; \
85+
echo "Verifying install ..."; \
86+
fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
87+
echo "javac --version"; javac --version; \
88+
echo "java --version"; java --version; \
89+
echo "Complete."
90+
COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh
91+
ENTRYPOINT ["/__cacert_entrypoint.sh"]
92+
93+
CMD ["jshell"]
File renamed without changes.

17/jdk/ubi/ubi9-minimal/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ RUN set -eux; \
7676
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
7777
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
7878
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
79-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
79+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
8080
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
8181
mkdir -p "$JAVA_HOME"; \
8282
tar --extract \

17/jdk/ubuntu/focal/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RUN set -eux; \
8787
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
8888
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
8989
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
90-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
90+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
9191
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
9292
mkdir -p "$JAVA_HOME"; \
9393
tar --extract \

17/jdk/ubuntu/jammy/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RUN set -eux; \
8787
# gpg: key 843C48A565F8F04B: "Adoptium GPG Key (DEB/RPM Signing Key) <[email protected]>" imported
8888
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 3B04D753C9050D9A5D343F39843C48A565F8F04B; \
8989
gpg --batch --verify /tmp/openjdk.tar.gz.sig /tmp/openjdk.tar.gz; \
90-
rm -r "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
90+
rm -rf "${GNUPGHOME}" /tmp/openjdk.tar.gz.sig; \
9191
echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
9292
mkdir -p "$JAVA_HOME"; \
9393
tar --extract \

0 commit comments

Comments
 (0)