Update openjdk #8632
Merged
Update openjdk #8632
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
Changes: - docker-library/openjdk@e47ecbf: Merge pull request docker-library/openjdk#431 from infosiftr/ol8-utf8 - docker-library/openjdk@52cb2ce: Use "C.UTF-8" in Oracle Linux 8 (it doesn't have "en_US.UTF-8" like 7 did)
Diff for d5c4ce3:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 836903f..d963350 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -64,7 +64,7 @@ Constraints: windowsservercore-ltsc2016
Tags: 11.0.8-jdk-buster, 11.0.8-buster, 11.0-jdk-buster, 11.0-buster, 11-jdk-buster, 11-buster
SharedTags: 11.0.8-jdk, 11.0.8, 11.0-jdk, 11.0, 11-jdk, 11
Architectures: amd64, arm64v8
-GitCommit: 83fbf16d99f4094df192b4f07909b473ad1d8392
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 11/jdk/buster
Tags: 11.0.8-jdk-nanoserver-1809, 11.0.8-nanoserver-1809, 11.0-jdk-nanoserver-1809, 11.0-nanoserver-1809, 11-jdk-nanoserver-1809, 11-nanoserver-1809
@@ -76,7 +76,7 @@ Constraints: nanoserver-1809, windowsservercore-1809
Tags: 11.0.8-jdk-slim-buster, 11.0.8-slim-buster, 11.0-jdk-slim-buster, 11.0-slim-buster, 11-jdk-slim-buster, 11-slim-buster, 11.0.8-jdk-slim, 11.0.8-slim, 11.0-jdk-slim, 11.0-slim, 11-jdk-slim, 11-slim
Architectures: amd64, arm64v8
-GitCommit: 83fbf16d99f4094df192b4f07909b473ad1d8392
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 11/jdk/slim-buster
Tags: 11.0.8-jdk-windowsservercore-1809, 11.0.8-windowsservercore-1809, 11.0-jdk-windowsservercore-1809, 11.0-windowsservercore-1809, 11-jdk-windowsservercore-1809, 11-windowsservercore-1809
@@ -126,7 +126,7 @@ Directory: 11/jre/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
Tags: 14.0.2-jdk-buster, 14.0.2-buster, 14.0-jdk-buster, 14.0-buster, 14-jdk-buster, 14-buster, jdk-buster, buster
-GitCommit: 83fbf16d99f4094df192b4f07909b473ad1d8392
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 14/jdk/buster
Tags: 14.0.2-jdk-nanoserver-1809, 14.0.2-nanoserver-1809, 14.0-jdk-nanoserver-1809, 14.0-nanoserver-1809, 14-jdk-nanoserver-1809, 14-nanoserver-1809, jdk-nanoserver-1809, nanoserver-1809
@@ -137,16 +137,16 @@ Directory: 14/jdk/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
Tags: 14.0.2-jdk-oraclelinux7, 14.0.2-oraclelinux7, 14.0-jdk-oraclelinux7, 14.0-oraclelinux7, 14-jdk-oraclelinux7, 14-oraclelinux7, jdk-oraclelinux7, oraclelinux7
-GitCommit: 83fbf16d99f4094df192b4f07909b473ad1d8392
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 14/jdk/oraclelinux7
Tags: 14.0.2-jdk-oraclelinux8, 14.0.2-oraclelinux8, 14.0-jdk-oraclelinux8, 14.0-oraclelinux8, 14-jdk-oraclelinux8, 14-oraclelinux8, jdk-oraclelinux8, oraclelinux8, 14.0.2-jdk-oracle, 14.0.2-oracle, 14.0-jdk-oracle, 14.0-oracle, 14-jdk-oracle, 14-oracle, jdk-oracle, oracle
SharedTags: 14.0.2-jdk, 14.0.2, 14.0-jdk, 14.0, 14-jdk, 14, jdk, latest
-GitCommit: 754d834164985ed1852aad4bb6c86ae199683ff8
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 14/jdk/oraclelinux8
Tags: 14.0.2-jdk-slim-buster, 14.0.2-slim-buster, 14.0-jdk-slim-buster, 14.0-slim-buster, 14-jdk-slim-buster, 14-slim-buster, jdk-slim-buster, slim-buster, 14.0.2-jdk-slim, 14.0.2-slim, 14.0-jdk-slim, 14.0-slim, 14-jdk-slim, 14-slim, jdk-slim, slim
-GitCommit: 83fbf16d99f4094df192b4f07909b473ad1d8392
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 14/jdk/slim-buster
Tags: 14.0.2-jdk-windowsservercore-1809, 14.0.2-windowsservercore-1809, 14.0-jdk-windowsservercore-1809, 14.0-windowsservercore-1809, 14-jdk-windowsservercore-1809, 14-windowsservercore-1809, jdk-windowsservercore-1809, windowsservercore-1809
@@ -165,7 +165,7 @@ Constraints: windowsservercore-ltsc2016
Tags: 15-jdk-buster, 15-buster
Architectures: amd64, arm64v8
-GitCommit: 82d5067061455260f202a00c42ce372d43038be0
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 15/jdk/buster
Tags: 15-jdk-nanoserver-1809, 15-nanoserver-1809
@@ -177,18 +177,18 @@ Constraints: nanoserver-1809, windowsservercore-1809
Tags: 15-jdk-oraclelinux7, 15-oraclelinux7
Architectures: amd64, arm64v8
-GitCommit: 82d5067061455260f202a00c42ce372d43038be0
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 15/jdk/oraclelinux7
Tags: 15-jdk-oraclelinux8, 15-oraclelinux8, 15-jdk-oracle, 15-oracle
SharedTags: 15-jdk, 15
Architectures: amd64, arm64v8
-GitCommit: 754d834164985ed1852aad4bb6c86ae199683ff8
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 15/jdk/oraclelinux8
Tags: 15-jdk-slim-buster, 15-slim-buster, 15-jdk-slim, 15-slim
Architectures: amd64, arm64v8
-GitCommit: 82d5067061455260f202a00c42ce372d43038be0
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 15/jdk/slim-buster
Tags: 15-jdk-windowsservercore-1809, 15-windowsservercore-1809
@@ -206,12 +206,12 @@ Directory: 15/jdk/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
Tags: 16-ea-5-jdk-alpine3.12, 16-ea-5-alpine3.12, 16-ea-jdk-alpine3.12, 16-ea-alpine3.12, 16-jdk-alpine3.12, 16-alpine3.12, 16-ea-5-jdk-alpine, 16-ea-5-alpine, 16-ea-jdk-alpine, 16-ea-alpine, 16-jdk-alpine, 16-alpine
-GitCommit: 83fbf16d99f4094df192b4f07909b473ad1d8392
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 16/jdk/alpine3.12
Tags: 16-ea-13-jdk-buster, 16-ea-13-buster, 16-ea-jdk-buster, 16-ea-buster, 16-jdk-buster, 16-buster
Architectures: amd64, arm64v8
-GitCommit: 6d84f8417bf9eb6d25515ab2400c02704bf9b8ea
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 16/jdk/buster
Tags: 16-ea-13-jdk-nanoserver-1809, 16-ea-13-nanoserver-1809, 16-ea-jdk-nanoserver-1809, 16-ea-nanoserver-1809, 16-jdk-nanoserver-1809, 16-nanoserver-1809
@@ -223,18 +223,18 @@ Constraints: nanoserver-1809, windowsservercore-1809
Tags: 16-ea-13-jdk-oraclelinux7, 16-ea-13-oraclelinux7, 16-ea-jdk-oraclelinux7, 16-ea-oraclelinux7, 16-jdk-oraclelinux7, 16-oraclelinux7
Architectures: amd64, arm64v8
-GitCommit: 6d84f8417bf9eb6d25515ab2400c02704bf9b8ea
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 16/jdk/oraclelinux7
Tags: 16-ea-13-jdk-oraclelinux8, 16-ea-13-oraclelinux8, 16-ea-jdk-oraclelinux8, 16-ea-oraclelinux8, 16-jdk-oraclelinux8, 16-oraclelinux8, 16-ea-13-jdk-oracle, 16-ea-13-oracle, 16-ea-jdk-oracle, 16-ea-oracle, 16-jdk-oracle, 16-oracle
SharedTags: 16-ea-13-jdk, 16-ea-13, 16-ea-jdk, 16-ea, 16-jdk, 16
Architectures: amd64, arm64v8
-GitCommit: 6d84f8417bf9eb6d25515ab2400c02704bf9b8ea
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 16/jdk/oraclelinux8
Tags: 16-ea-13-jdk-slim-buster, 16-ea-13-slim-buster, 16-ea-jdk-slim-buster, 16-ea-slim-buster, 16-jdk-slim-buster, 16-slim-buster, 16-ea-13-jdk-slim, 16-ea-13-slim, 16-ea-jdk-slim, 16-ea-slim, 16-jdk-slim, 16-slim
Architectures: amd64, arm64v8
-GitCommit: 6d84f8417bf9eb6d25515ab2400c02704bf9b8ea
+GitCommit: 52cb2ce3bda94b1c0229f11bfa176035ad41c9b8
Directory: 16/jdk/slim-buster
Tags: 16-ea-13-jdk-windowsservercore-1809, 16-ea-13-windowsservercore-1809, 16-ea-jdk-windowsservercore-1809, 16-ea-windowsservercore-1809, 16-jdk-windowsservercore-1809, 16-windowsservercore-1809
diff --git a/openjdk_11-buster/Dockerfile b/openjdk_11-buster/Dockerfile
index 5d1afbd..7326aaf 100644
--- a/openjdk_11-buster/Dockerfile
+++ b/openjdk_11-buster/Dockerfile
@@ -104,6 +104,7 @@ RUN set -eux; \
ldconfig; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_11-slim/Dockerfile b/openjdk_11-slim/Dockerfile
index d53f274..781128a 100644
--- a/openjdk_11-slim/Dockerfile
+++ b/openjdk_11-slim/Dockerfile
@@ -108,6 +108,7 @@ RUN set -eux; \
ldconfig; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_15-buster/Dockerfile b/openjdk_15-buster/Dockerfile
index 04ead8c..ec85495 100644
--- a/openjdk_15-buster/Dockerfile
+++ b/openjdk_15-buster/Dockerfile
@@ -92,6 +92,7 @@ RUN set -eux; \
java -Xshare:dump; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_15-oracle/Dockerfile b/openjdk_15-oracle/Dockerfile
index 7a63e1e..cdd5d79 100644
--- a/openjdk_15-oracle/Dockerfile
+++ b/openjdk_15-oracle/Dockerfile
@@ -15,7 +15,7 @@ RUN set -eux; \
microdnf clean all
# Default to UTF-8 file.encoding
-ENV LANG en_US.UTF-8
+ENV LANG C.UTF-8
ENV JAVA_HOME /usr/java/openjdk-15
ENV PATH $JAVA_HOME/bin:$PATH
@@ -76,6 +76,7 @@ RUN set -eux; \
ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/lib/security/cacerts"; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_15-oraclelinux7/Dockerfile b/openjdk_15-oraclelinux7/Dockerfile
index 6bfc587..5967e1d 100644
--- a/openjdk_15-oraclelinux7/Dockerfile
+++ b/openjdk_15-oraclelinux7/Dockerfile
@@ -76,6 +76,7 @@ RUN set -eux; \
ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/lib/security/cacerts"; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_15-slim/Dockerfile b/openjdk_15-slim/Dockerfile
index 3383779..97bd3a5 100644
--- a/openjdk_15-slim/Dockerfile
+++ b/openjdk_15-slim/Dockerfile
@@ -91,6 +91,7 @@ RUN set -eux; \
java -Xshare:dump; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_16-alpine/Dockerfile b/openjdk_16-alpine/Dockerfile
index b85dfe2..8715311 100644
--- a/openjdk_16-alpine/Dockerfile
+++ b/openjdk_16-alpine/Dockerfile
@@ -47,6 +47,7 @@ RUN set -eux; \
java -Xshare:dump; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_16-buster/Dockerfile b/openjdk_16-buster/Dockerfile
index 4b9706e..cd4c016 100644
--- a/openjdk_16-buster/Dockerfile
+++ b/openjdk_16-buster/Dockerfile
@@ -92,6 +92,7 @@ RUN set -eux; \
java -Xshare:dump; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_16-oracle/Dockerfile b/openjdk_16-oracle/Dockerfile
index 6d6fa82..42f438f 100644
--- a/openjdk_16-oracle/Dockerfile
+++ b/openjdk_16-oracle/Dockerfile
@@ -15,7 +15,7 @@ RUN set -eux; \
microdnf clean all
# Default to UTF-8 file.encoding
-ENV LANG en_US.UTF-8
+ENV LANG C.UTF-8
ENV JAVA_HOME /usr/java/openjdk-16
ENV PATH $JAVA_HOME/bin:$PATH
@@ -76,6 +76,7 @@ RUN set -eux; \
ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/lib/security/cacerts"; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_16-oraclelinux7/Dockerfile b/openjdk_16-oraclelinux7/Dockerfile
index cf68168..f49e759 100644
--- a/openjdk_16-oraclelinux7/Dockerfile
+++ b/openjdk_16-oraclelinux7/Dockerfile
@@ -76,6 +76,7 @@ RUN set -eux; \
ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/lib/security/cacerts"; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_16-slim/Dockerfile b/openjdk_16-slim/Dockerfile
index 79fc990..c5adab2 100644
--- a/openjdk_16-slim/Dockerfile
+++ b/openjdk_16-slim/Dockerfile
@@ -91,6 +91,7 @@ RUN set -eux; \
java -Xshare:dump; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_buster/Dockerfile b/openjdk_buster/Dockerfile
index 86e619b..366e657 100644
--- a/openjdk_buster/Dockerfile
+++ b/openjdk_buster/Dockerfile
@@ -87,6 +87,7 @@ RUN set -eux; \
java -Xshare:dump; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_oracle/Dockerfile b/openjdk_oracle/Dockerfile
index b918203..d9828f3 100644
--- a/openjdk_oracle/Dockerfile
+++ b/openjdk_oracle/Dockerfile
@@ -15,7 +15,7 @@ RUN set -eux; \
microdnf clean all
# Default to UTF-8 file.encoding
-ENV LANG en_US.UTF-8
+ENV LANG C.UTF-8
ENV JAVA_HOME /usr/java/openjdk-14
ENV PATH $JAVA_HOME/bin:$PATH
@@ -71,6 +71,7 @@ RUN set -eux; \
ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/lib/security/cacerts"; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_oraclelinux7/Dockerfile b/openjdk_oraclelinux7/Dockerfile
index 5e4d8d5..50c461c 100644
--- a/openjdk_oraclelinux7/Dockerfile
+++ b/openjdk_oraclelinux7/Dockerfile
@@ -71,6 +71,7 @@ RUN set -eux; \
ln -sT /etc/pki/ca-trust/extracted/java/cacerts "$JAVA_HOME/lib/security/cacerts"; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
diff --git a/openjdk_slim/Dockerfile b/openjdk_slim/Dockerfile
index fa806d9..2812613 100644
--- a/openjdk_slim/Dockerfile
+++ b/openjdk_slim/Dockerfile
@@ -86,6 +86,7 @@ RUN set -eux; \
java -Xshare:dump; \
\
# basic smoke test
+ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \
javac --version; \
java --version
|
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.
Changes: