-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update openjdk #8390
Merged
Merged
Update openjdk #8390
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@68069ca: Merge pull request docker-library/openjdk#423 from infosiftr/alpine3.12 - docker-library/openjdk@9efa5c2: Update Alpine to 3.12 - docker-library/openjdk@e3021b3: Update to 15-ea+31 - docker-library/openjdk@e9243a2: Update to 16-ea+5
Diff for 9fddf78:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3778d93..5deb84e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -159,8 +159,8 @@ GitCommit: 29c17de6c8c0df6304d0c80f569deea1d4b6a23e
Directory: 14/jdk/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
-Tags: 15-ea-10-jdk-alpine3.11, 15-ea-10-alpine3.11, 15-ea-jdk-alpine3.11, 15-ea-alpine3.11, 15-jdk-alpine3.11, 15-alpine3.11, 15-ea-10-jdk-alpine, 15-ea-10-alpine, 15-ea-jdk-alpine, 15-ea-alpine, 15-jdk-alpine, 15-alpine
-GitCommit: ba84c1878998602129f0d7d94d26aae5e04bc872
+Tags: 15-ea-31-jdk-alpine3.12, 15-ea-31-alpine3.12, 15-ea-jdk-alpine3.12, 15-ea-alpine3.12, 15-jdk-alpine3.12, 15-alpine3.12, 15-ea-31-jdk-alpine, 15-ea-31-alpine, 15-ea-jdk-alpine, 15-ea-alpine, 15-jdk-alpine, 15-alpine
+GitCommit: 9efa5c2bd28c10d07e70ceac416187a011dd6184
Directory: 15/jdk/alpine
Tags: 15-ea-32-jdk-buster, 15-ea-32-buster, 15-ea-jdk-buster, 15-ea-buster, 15-jdk-buster, 15-buster
@@ -200,6 +200,10 @@ GitCommit: 748340041f02cdc9956b7653b6144224a97bf71d
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: 9efa5c2bd28c10d07e70ceac416187a011dd6184
+Directory: 16/jdk/alpine
+
Tags: 16-ea-6-jdk-buster, 16-ea-6-buster, 16-ea-jdk-buster, 16-ea-buster, 16-jdk-buster, 16-buster
Architectures: amd64, arm64v8
GitCommit: f28e00f31f9b3e60a60d70a138af3528a89f9f40
diff --git a/_bashbrew-list b/_bashbrew-list
index cfeaefa..a059695 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -201,13 +201,13 @@ openjdk:14.0.2-windowsservercore-1809
openjdk:14.0.2-windowsservercore-ltsc2016
openjdk:15
openjdk:15-alpine
-openjdk:15-alpine3.11
+openjdk:15-alpine3.12
openjdk:15-buster
openjdk:15-ea
-openjdk:15-ea-10-alpine
-openjdk:15-ea-10-alpine3.11
-openjdk:15-ea-10-jdk-alpine
-openjdk:15-ea-10-jdk-alpine3.11
+openjdk:15-ea-31-alpine
+openjdk:15-ea-31-alpine3.12
+openjdk:15-ea-31-jdk-alpine
+openjdk:15-ea-31-jdk-alpine3.12
openjdk:15-ea-32
openjdk:15-ea-32-buster
openjdk:15-ea-32-jdk
@@ -231,11 +231,11 @@ openjdk:15-ea-32-windowsservercore
openjdk:15-ea-32-windowsservercore-1809
openjdk:15-ea-32-windowsservercore-ltsc2016
openjdk:15-ea-alpine
-openjdk:15-ea-alpine3.11
+openjdk:15-ea-alpine3.12
openjdk:15-ea-buster
openjdk:15-ea-jdk
openjdk:15-ea-jdk-alpine
-openjdk:15-ea-jdk-alpine3.11
+openjdk:15-ea-jdk-alpine3.12
openjdk:15-ea-jdk-buster
openjdk:15-ea-jdk-nanoserver
openjdk:15-ea-jdk-nanoserver-1809
@@ -257,7 +257,7 @@ openjdk:15-ea-windowsservercore-1809
openjdk:15-ea-windowsservercore-ltsc2016
openjdk:15-jdk
openjdk:15-jdk-alpine
-openjdk:15-jdk-alpine3.11
+openjdk:15-jdk-alpine3.12
openjdk:15-jdk-buster
openjdk:15-jdk-nanoserver
openjdk:15-jdk-nanoserver-1809
@@ -278,8 +278,14 @@ openjdk:15-windowsservercore
openjdk:15-windowsservercore-1809
openjdk:15-windowsservercore-ltsc2016
openjdk:16
+openjdk:16-alpine
+openjdk:16-alpine3.12
openjdk:16-buster
openjdk:16-ea
+openjdk:16-ea-5-alpine
+openjdk:16-ea-5-alpine3.12
+openjdk:16-ea-5-jdk-alpine
+openjdk:16-ea-5-jdk-alpine3.12
openjdk:16-ea-6
openjdk:16-ea-6-buster
openjdk:16-ea-6-jdk
@@ -302,8 +308,12 @@ openjdk:16-ea-6-slim-buster
openjdk:16-ea-6-windowsservercore
openjdk:16-ea-6-windowsservercore-1809
openjdk:16-ea-6-windowsservercore-ltsc2016
+openjdk:16-ea-alpine
+openjdk:16-ea-alpine3.12
openjdk:16-ea-buster
openjdk:16-ea-jdk
+openjdk:16-ea-jdk-alpine
+openjdk:16-ea-jdk-alpine3.12
openjdk:16-ea-jdk-buster
openjdk:16-ea-jdk-nanoserver
openjdk:16-ea-jdk-nanoserver-1809
@@ -324,6 +334,8 @@ openjdk:16-ea-windowsservercore
openjdk:16-ea-windowsservercore-1809
openjdk:16-ea-windowsservercore-ltsc2016
openjdk:16-jdk
+openjdk:16-jdk-alpine
+openjdk:16-jdk-alpine3.12
openjdk:16-jdk-buster
openjdk:16-jdk-nanoserver
openjdk:16-jdk-nanoserver-1809
diff --git a/openjdk_15-alpine/Dockerfile b/openjdk_15-alpine/Dockerfile
index 617c8cb..566797a 100644
--- a/openjdk_15-alpine/Dockerfile
+++ b/openjdk_15-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
RUN apk add --no-cache java-cacerts
@@ -7,9 +7,9 @@ ENV PATH $JAVA_HOME/bin:$PATH
# https://jdk.java.net/
# > Java Development Kit builds, from Oracle
-ENV JAVA_VERSION 15-ea+10
-ENV JAVA_URL https://download.java.net/java/early_access/alpine/10/binaries/openjdk-15-ea+10_linux-x64-musl_bin.tar.gz
-ENV JAVA_SHA256 15a5e8002e24ed129b82bfe55ffe4bdbf3cfd0a7e5ad3399879cdd44175bfd06
+ENV JAVA_VERSION 15-ea+31
+ENV JAVA_URL https://download.java.net/java/early_access/alpine/31/binaries/openjdk-15-ea+31_linux-x64-musl_bin.tar.gz
+ENV JAVA_SHA256 da7abd4d3b3511ed2da8aba25b7ff67863261a0c8b5e7e771cf0fbfadcc7f4fd
# "For Alpine Linux, builds are produced on a reduced schedule and may not be in sync with the other platforms."
RUN set -eux; \
diff --git a/openjdk_15-alpine/Dockerfile b/openjdk_16-alpine/Dockerfile
similarity index 84%
copy from openjdk_15-alpine/Dockerfile
copy to openjdk_16-alpine/Dockerfile
index 617c8cb..2fa9cf7 100644
--- a/openjdk_15-alpine/Dockerfile
+++ b/openjdk_16-alpine/Dockerfile
@@ -1,15 +1,15 @@
-FROM alpine:3.11
+FROM alpine:3.12
RUN apk add --no-cache java-cacerts
-ENV JAVA_HOME /opt/openjdk-15
+ENV JAVA_HOME /opt/openjdk-16
ENV PATH $JAVA_HOME/bin:$PATH
# https://jdk.java.net/
# > Java Development Kit builds, from Oracle
-ENV JAVA_VERSION 15-ea+10
-ENV JAVA_URL https://download.java.net/java/early_access/alpine/10/binaries/openjdk-15-ea+10_linux-x64-musl_bin.tar.gz
-ENV JAVA_SHA256 15a5e8002e24ed129b82bfe55ffe4bdbf3cfd0a7e5ad3399879cdd44175bfd06
+ENV JAVA_VERSION 16-ea+5
+ENV JAVA_URL https://download.java.net/java/early_access/alpine/5/binaries/openjdk-16-ea+5_linux-x64-musl_bin.tar.gz
+ENV JAVA_SHA256 1ec940bea148a7ececda635c209de3836fe4e6511f5d49d4248cf6d52c77aac8
# "For Alpine Linux, builds are produced on a reduced schedule and may not be in sync with the other platforms."
RUN set -eux; \ |
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: