Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Switch "latest" variants from OpenJDK to Temurin #265

Merged
merged 1 commit into from
Jun 16, 2022
Merged

Switch "latest" variants from OpenJDK to Temurin #265

merged 1 commit into from
Jun 16, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 16, 2022 •
edited
Loading

This is in preparation of the OpenJDK image deprecation -- see https://snyk.io/jvm-ecosystem-report-2021/ for a reasonable justification for Temurin being the new default (the OpenJDK image is being deprecated largely because Temurin already is roughly vanilla OpenJDK builds, but with proper community support).

See also docker-library/docs#2162, docker-library/openjdk#505

While making this change, I noticed/realized we should add the jammy variants of Temurin, but didn't want to conflate that and this.

@tianon
Switch "latest" variants from OpenJDK to Temurin
ed54ae6 
This is in preparation of the OpenJDK image deprecation -- see https://snyk.io/jvm-ecosystem-report-2021/ for a reasonable justification for Temurin being the new default (the OpenJDK image is being deprecated largely because Temurin already *is* roughly vanilla OpenJDK builds, but with proper community support).
@tianon
Copy link
Member Author

tianon commented Jun 16, 2022

Here's a diff using https://github.com/docker-library/official-images/blob/295e53aa7f21c6a7289f6384bc289b206f1f139e/_bashbrew-cat-sorted.sh for a more deterministic order (since I've also adjusted the ordering to put temurin variants first, then openjdk variants as before, then everything else which is currently just corretto).

Diff: 
--- /dev/fd/63	2022-06-16 15:30:10.901719037 -0700
+++ /dev/fd/62	2022-06-16 15:30:10.901719037 -0700
@@ -6,7 +6,7 @@
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk8/corretto
 
-Tags: 8.5.81-jdk8-openjdk-bullseye, 8.5-jdk8-openjdk-bullseye, 8-jdk8-openjdk-bullseye, 8.5.81-jdk8-openjdk, 8.5-jdk8-openjdk, 8-jdk8-openjdk, 8.5.81-jdk8, 8.5-jdk8, 8-jdk8
+Tags: 8.5.81-jdk8-openjdk-bullseye, 8.5-jdk8-openjdk-bullseye, 8-jdk8-openjdk-bullseye, 8.5.81-jdk8-openjdk, 8.5-jdk8-openjdk, 8-jdk8-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk8/openjdk-bullseye
@@ -26,7 +26,7 @@
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk8/openjdk-slim-buster
 
-Tags: 8.5.81-jdk8-temurin-focal, 8.5-jdk8-temurin-focal, 8-jdk8-temurin-focal, 8.5.81-jdk8-temurin, 8.5-jdk8-temurin, 8-jdk8-temurin
+Tags: 8.5.81-jdk8-temurin-focal, 8.5-jdk8-temurin-focal, 8-jdk8-temurin-focal, 8.5.81-jdk8-temurin, 8.5-jdk8-temurin, 8-jdk8-temurin, 8.5.81-jdk8, 8.5-jdk8, 8-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk8/temurin-focal
@@ -36,7 +36,7 @@
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk11/corretto
 
-Tags: 8.5.81-jdk11-openjdk-bullseye, 8.5-jdk11-openjdk-bullseye, 8-jdk11-openjdk-bullseye, 8.5.81-jdk11-openjdk, 8.5-jdk11-openjdk, 8-jdk11-openjdk, 8.5.81-jdk11, 8.5-jdk11, 8-jdk11, 8.5.81, 8.5, 8
+Tags: 8.5.81-jdk11-openjdk-bullseye, 8.5-jdk11-openjdk-bullseye, 8-jdk11-openjdk-bullseye, 8.5.81-jdk11-openjdk, 8.5-jdk11-openjdk, 8-jdk11-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk11/openjdk-bullseye
@@ -56,7 +56,7 @@
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk11/openjdk-slim-buster
 
-Tags: 8.5.81-jdk11-temurin-focal, 8.5-jdk11-temurin-focal, 8-jdk11-temurin-focal, 8.5.81-jdk11-temurin, 8.5-jdk11-temurin, 8-jdk11-temurin
+Tags: 8.5.81-jdk11-temurin-focal, 8.5-jdk11-temurin-focal, 8-jdk11-temurin-focal, 8.5.81-jdk11-temurin, 8.5-jdk11-temurin, 8-jdk11-temurin, 8.5.81-jdk11, 8.5-jdk11, 8-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk11/temurin-focal
@@ -66,12 +66,12 @@
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk17/corretto
 
-Tags: 8.5.81-jdk17-temurin-focal, 8.5-jdk17-temurin-focal, 8-jdk17-temurin-focal, 8.5.81-jdk17-temurin, 8.5-jdk17-temurin, 8-jdk17-temurin
+Tags: 8.5.81-jdk17-temurin-focal, 8.5-jdk17-temurin-focal, 8-jdk17-temurin-focal, 8.5.81-jdk17-temurin, 8.5-jdk17-temurin, 8-jdk17-temurin, 8.5.81-jdk17, 8.5-jdk17, 8-jdk17, 8.5.81, 8.5, 8
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jdk17/temurin-focal
 
-Tags: 8.5.81-jre8-openjdk-bullseye, 8.5-jre8-openjdk-bullseye, 8-jre8-openjdk-bullseye, 8.5.81-jre8-openjdk, 8.5-jre8-openjdk, 8-jre8-openjdk, 8.5.81-jre8, 8.5-jre8, 8-jre8
+Tags: 8.5.81-jre8-openjdk-bullseye, 8.5-jre8-openjdk-bullseye, 8-jre8-openjdk-bullseye, 8.5.81-jre8-openjdk, 8.5-jre8-openjdk, 8-jre8-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jre8/openjdk-bullseye
@@ -91,12 +91,12 @@
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jre8/openjdk-slim-buster
 
-Tags: 8.5.81-jre8-temurin-focal, 8.5-jre8-temurin-focal, 8-jre8-temurin-focal, 8.5.81-jre8-temurin, 8.5-jre8-temurin, 8-jre8-temurin
+Tags: 8.5.81-jre8-temurin-focal, 8.5-jre8-temurin-focal, 8-jre8-temurin-focal, 8.5.81-jre8-temurin, 8.5-jre8-temurin, 8-jre8-temurin, 8.5.81-jre8, 8.5-jre8, 8-jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jre8/temurin-focal
 
-Tags: 8.5.81-jre11-openjdk-bullseye, 8.5-jre11-openjdk-bullseye, 8-jre11-openjdk-bullseye, 8.5.81-jre11-openjdk, 8.5-jre11-openjdk, 8-jre11-openjdk, 8.5.81-jre11, 8.5-jre11, 8-jre11
+Tags: 8.5.81-jre11-openjdk-bullseye, 8.5-jre11-openjdk-bullseye, 8-jre11-openjdk-bullseye, 8.5.81-jre11-openjdk, 8.5-jre11-openjdk, 8-jre11-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jre11/openjdk-bullseye
@@ -116,12 +116,12 @@
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jre11/openjdk-slim-buster
 
-Tags: 8.5.81-jre11-temurin-focal, 8.5-jre11-temurin-focal, 8-jre11-temurin-focal, 8.5.81-jre11-temurin, 8.5-jre11-temurin, 8-jre11-temurin
+Tags: 8.5.81-jre11-temurin-focal, 8.5-jre11-temurin-focal, 8-jre11-temurin-focal, 8.5.81-jre11-temurin, 8.5-jre11-temurin, 8-jre11-temurin, 8.5.81-jre11, 8.5-jre11, 8-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jre11/temurin-focal
 
-Tags: 8.5.81-jre17-temurin-focal, 8.5-jre17-temurin-focal, 8-jre17-temurin-focal, 8.5.81-jre17-temurin, 8.5-jre17-temurin, 8-jre17-temurin
+Tags: 8.5.81-jre17-temurin-focal, 8.5-jre17-temurin-focal, 8-jre17-temurin-focal, 8.5.81-jre17-temurin, 8.5-jre17-temurin, 8-jre17-temurin, 8.5.81-jre17, 8.5-jre17, 8-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 204a156c364fbcee02209cbdd41134797ef17172
 Directory: 8.5/jre17/temurin-focal
@@ -131,7 +131,7 @@
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk8/corretto
 
-Tags: 9.0.64-jdk8-openjdk-bullseye, 9.0-jdk8-openjdk-bullseye, 9-jdk8-openjdk-bullseye, 9.0.64-jdk8-openjdk, 9.0-jdk8-openjdk, 9-jdk8-openjdk, 9.0.64-jdk8, 9.0-jdk8, 9-jdk8
+Tags: 9.0.64-jdk8-openjdk-bullseye, 9.0-jdk8-openjdk-bullseye, 9-jdk8-openjdk-bullseye, 9.0.64-jdk8-openjdk, 9.0-jdk8-openjdk, 9-jdk8-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk8/openjdk-bullseye
@@ -151,7 +151,7 @@
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk8/openjdk-slim-buster
 
-Tags: 9.0.64-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal, 9.0.64-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin
+Tags: 9.0.64-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal, 9.0.64-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.64-jdk8, 9.0-jdk8, 9-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk8/temurin-focal
@@ -161,7 +161,7 @@
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk11/corretto
 
-Tags: 9.0.64-jdk11-openjdk-bullseye, 9.0-jdk11-openjdk-bullseye, 9-jdk11-openjdk-bullseye, 9.0.64-jdk11-openjdk, 9.0-jdk11-openjdk, 9-jdk11-openjdk, 9.0.64-jdk11, 9.0-jdk11, 9-jdk11, 9.0.64, 9.0, 9
+Tags: 9.0.64-jdk11-openjdk-bullseye, 9.0-jdk11-openjdk-bullseye, 9-jdk11-openjdk-bullseye, 9.0.64-jdk11-openjdk, 9.0-jdk11-openjdk, 9-jdk11-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk11/openjdk-bullseye
@@ -181,7 +181,7 @@
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk11/openjdk-slim-buster
 
-Tags: 9.0.64-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal, 9.0.64-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin
+Tags: 9.0.64-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal, 9.0.64-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.64-jdk11, 9.0-jdk11, 9-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk11/temurin-focal
@@ -191,12 +191,12 @@
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk17/corretto
 
-Tags: 9.0.64-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal, 9.0.64-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin
+Tags: 9.0.64-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal, 9.0.64-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.64-jdk17, 9.0-jdk17, 9-jdk17, 9.0.64, 9.0, 9
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jdk17/temurin-focal
 
-Tags: 9.0.64-jre8-openjdk-bullseye, 9.0-jre8-openjdk-bullseye, 9-jre8-openjdk-bullseye, 9.0.64-jre8-openjdk, 9.0-jre8-openjdk, 9-jre8-openjdk, 9.0.64-jre8, 9.0-jre8, 9-jre8
+Tags: 9.0.64-jre8-openjdk-bullseye, 9.0-jre8-openjdk-bullseye, 9-jre8-openjdk-bullseye, 9.0.64-jre8-openjdk, 9.0-jre8-openjdk, 9-jre8-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jre8/openjdk-bullseye
@@ -216,12 +216,12 @@
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jre8/openjdk-slim-buster
 
-Tags: 9.0.64-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal, 9.0.64-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin
+Tags: 9.0.64-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal, 9.0.64-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.64-jre8, 9.0-jre8, 9-jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jre8/temurin-focal
 
-Tags: 9.0.64-jre11-openjdk-bullseye, 9.0-jre11-openjdk-bullseye, 9-jre11-openjdk-bullseye, 9.0.64-jre11-openjdk, 9.0-jre11-openjdk, 9-jre11-openjdk, 9.0.64-jre11, 9.0-jre11, 9-jre11
+Tags: 9.0.64-jre11-openjdk-bullseye, 9.0-jre11-openjdk-bullseye, 9-jre11-openjdk-bullseye, 9.0.64-jre11-openjdk, 9.0-jre11-openjdk, 9-jre11-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jre11/openjdk-bullseye
@@ -241,12 +241,12 @@
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jre11/openjdk-slim-buster
 
-Tags: 9.0.64-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal, 9.0.64-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin
+Tags: 9.0.64-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal, 9.0.64-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.64-jre11, 9.0-jre11, 9-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jre11/temurin-focal
 
-Tags: 9.0.64-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal, 9.0.64-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin
+Tags: 9.0.64-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal, 9.0.64-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.64-jre17, 9.0-jre17, 9-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 8aaaad20360279ee83cb9f9b4fb69affe0837aaf
 Directory: 9.0/jre17/temurin-focal
@@ -256,7 +256,7 @@
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk8/corretto
 
-Tags: 10.0.22-jdk8-openjdk-bullseye, 10.0-jdk8-openjdk-bullseye, 10-jdk8-openjdk-bullseye, jdk8-openjdk-bullseye, 10.0.22-jdk8-openjdk, 10.0-jdk8-openjdk, 10-jdk8-openjdk, jdk8-openjdk, 10.0.22-jdk8, 10.0-jdk8, 10-jdk8, jdk8
+Tags: 10.0.22-jdk8-openjdk-bullseye, 10.0-jdk8-openjdk-bullseye, 10-jdk8-openjdk-bullseye, jdk8-openjdk-bullseye, 10.0.22-jdk8-openjdk, 10.0-jdk8-openjdk, 10-jdk8-openjdk, jdk8-openjdk
 Architectures: amd64, arm64v8
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk8/openjdk-bullseye
@@ -276,7 +276,7 @@
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk8/openjdk-slim-buster
 
-Tags: 10.0.22-jdk8-temurin-focal, 10.0-jdk8-temurin-focal, 10-jdk8-temurin-focal, jdk8-temurin-focal, 10.0.22-jdk8-temurin, 10.0-jdk8-temurin, 10-jdk8-temurin, jdk8-temurin
+Tags: 10.0.22-jdk8-temurin-focal, 10.0-jdk8-temurin-focal, 10-jdk8-temurin-focal, jdk8-temurin-focal, 10.0.22-jdk8-temurin, 10.0-jdk8-temurin, 10-jdk8-temurin, jdk8-temurin, 10.0.22-jdk8, 10.0-jdk8, 10-jdk8, jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk8/temurin-focal
@@ -286,7 +286,7 @@
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk11/corretto
 
-Tags: 10.0.22-jdk11-openjdk-bullseye, 10.0-jdk11-openjdk-bullseye, 10-jdk11-openjdk-bullseye, jdk11-openjdk-bullseye, 10.0.22-jdk11-openjdk, 10.0-jdk11-openjdk, 10-jdk11-openjdk, jdk11-openjdk, 10.0.22-jdk11, 10.0-jdk11, 10-jdk11, jdk11, 10.0.22, 10.0, 10, latest
+Tags: 10.0.22-jdk11-openjdk-bullseye, 10.0-jdk11-openjdk-bullseye, 10-jdk11-openjdk-bullseye, jdk11-openjdk-bullseye, 10.0.22-jdk11-openjdk, 10.0-jdk11-openjdk, 10-jdk11-openjdk, jdk11-openjdk
 Architectures: amd64, arm64v8
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk11/openjdk-bullseye
@@ -306,7 +306,7 @@
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk11/openjdk-slim-buster
 
-Tags: 10.0.22-jdk11-temurin-focal, 10.0-jdk11-temurin-focal, 10-jdk11-temurin-focal, jdk11-temurin-focal, 10.0.22-jdk11-temurin, 10.0-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin
+Tags: 10.0.22-jdk11-temurin-focal, 10.0-jdk11-temurin-focal, 10-jdk11-temurin-focal, jdk11-temurin-focal, 10.0.22-jdk11-temurin, 10.0-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.0.22-jdk11, 10.0-jdk11, 10-jdk11, jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk11/temurin-focal
@@ -316,12 +316,12 @@
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk17/corretto
 
-Tags: 10.0.22-jdk17-temurin-focal, 10.0-jdk17-temurin-focal, 10-jdk17-temurin-focal, jdk17-temurin-focal, 10.0.22-jdk17-temurin, 10.0-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin
+Tags: 10.0.22-jdk17-temurin-focal, 10.0-jdk17-temurin-focal, 10-jdk17-temurin-focal, jdk17-temurin-focal, 10.0.22-jdk17-temurin, 10.0-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.0.22-jdk17, 10.0-jdk17, 10-jdk17, jdk17, 10.0.22, 10.0, 10, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jdk17/temurin-focal
 
-Tags: 10.0.22-jre8-openjdk-bullseye, 10.0-jre8-openjdk-bullseye, 10-jre8-openjdk-bullseye, jre8-openjdk-bullseye, 10.0.22-jre8-openjdk, 10.0-jre8-openjdk, 10-jre8-openjdk, jre8-openjdk, 10.0.22-jre8, 10.0-jre8, 10-jre8, jre8
+Tags: 10.0.22-jre8-openjdk-bullseye, 10.0-jre8-openjdk-bullseye, 10-jre8-openjdk-bullseye, jre8-openjdk-bullseye, 10.0.22-jre8-openjdk, 10.0-jre8-openjdk, 10-jre8-openjdk, jre8-openjdk
 Architectures: amd64, arm64v8
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jre8/openjdk-bullseye
@@ -341,12 +341,12 @@
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jre8/openjdk-slim-buster
 
-Tags: 10.0.22-jre8-temurin-focal, 10.0-jre8-temurin-focal, 10-jre8-temurin-focal, jre8-temurin-focal, 10.0.22-jre8-temurin, 10.0-jre8-temurin, 10-jre8-temurin, jre8-temurin
+Tags: 10.0.22-jre8-temurin-focal, 10.0-jre8-temurin-focal, 10-jre8-temurin-focal, jre8-temurin-focal, 10.0.22-jre8-temurin, 10.0-jre8-temurin, 10-jre8-temurin, jre8-temurin, 10.0.22-jre8, 10.0-jre8, 10-jre8, jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jre8/temurin-focal
 
-Tags: 10.0.22-jre11-openjdk-bullseye, 10.0-jre11-openjdk-bullseye, 10-jre11-openjdk-bullseye, jre11-openjdk-bullseye, 10.0.22-jre11-openjdk, 10.0-jre11-openjdk, 10-jre11-openjdk, jre11-openjdk, 10.0.22-jre11, 10.0-jre11, 10-jre11, jre11
+Tags: 10.0.22-jre11-openjdk-bullseye, 10.0-jre11-openjdk-bullseye, 10-jre11-openjdk-bullseye, jre11-openjdk-bullseye, 10.0.22-jre11-openjdk, 10.0-jre11-openjdk, 10-jre11-openjdk, jre11-openjdk
 Architectures: amd64, arm64v8
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jre11/openjdk-bullseye
@@ -366,12 +366,12 @@
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jre11/openjdk-slim-buster
 
-Tags: 10.0.22-jre11-temurin-focal, 10.0-jre11-temurin-focal, 10-jre11-temurin-focal, jre11-temurin-focal, 10.0.22-jre11-temurin, 10.0-jre11-temurin, 10-jre11-temurin, jre11-temurin
+Tags: 10.0.22-jre11-temurin-focal, 10.0-jre11-temurin-focal, 10-jre11-temurin-focal, jre11-temurin-focal, 10.0.22-jre11-temurin, 10.0-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.0.22-jre11, 10.0-jre11, 10-jre11, jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jre11/temurin-focal
 
-Tags: 10.0.22-jre17-temurin-focal, 10.0-jre17-temurin-focal, 10-jre17-temurin-focal, jre17-temurin-focal, 10.0.22-jre17-temurin, 10.0-jre17-temurin, 10-jre17-temurin, jre17-temurin
+Tags: 10.0.22-jre17-temurin-focal, 10.0-jre17-temurin-focal, 10-jre17-temurin-focal, jre17-temurin-focal, 10.0.22-jre17-temurin, 10.0-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.0.22-jre17, 10.0-jre17, 10-jre17, jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: f70532cc0c2204ca15adea80f3ab9364e20ca7b0
 Directory: 10.0/jre17/temurin-focal
@@ -381,7 +381,7 @@
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jdk11/corretto
 
-Tags: 10.1.0-M16-jdk11-openjdk-bullseye, 10.1.0-jdk11-openjdk-bullseye, 10.1-jdk11-openjdk-bullseye, 10.1.0-M16-jdk11-openjdk, 10.1.0-jdk11-openjdk, 10.1-jdk11-openjdk, 10.1.0-M16-jdk11, 10.1.0-jdk11, 10.1-jdk11, 10.1.0-M16, 10.1.0, 10.1
+Tags: 10.1.0-M16-jdk11-openjdk-bullseye, 10.1.0-jdk11-openjdk-bullseye, 10.1-jdk11-openjdk-bullseye, 10.1.0-M16-jdk11-openjdk, 10.1.0-jdk11-openjdk, 10.1-jdk11-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jdk11/openjdk-bullseye
@@ -401,7 +401,7 @@
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jdk11/openjdk-slim-buster
 
-Tags: 10.1.0-M16-jdk11-temurin-focal, 10.1.0-jdk11-temurin-focal, 10.1-jdk11-temurin-focal, 10.1.0-M16-jdk11-temurin, 10.1.0-jdk11-temurin, 10.1-jdk11-temurin
+Tags: 10.1.0-M16-jdk11-temurin-focal, 10.1.0-jdk11-temurin-focal, 10.1-jdk11-temurin-focal, 10.1.0-M16-jdk11-temurin, 10.1.0-jdk11-temurin, 10.1-jdk11-temurin, 10.1.0-M16-jdk11, 10.1.0-jdk11, 10.1-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jdk11/temurin-focal
@@ -411,12 +411,12 @@
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jdk17/corretto
 
-Tags: 10.1.0-M16-jdk17-temurin-focal, 10.1.0-jdk17-temurin-focal, 10.1-jdk17-temurin-focal, 10.1.0-M16-jdk17-temurin, 10.1.0-jdk17-temurin, 10.1-jdk17-temurin
+Tags: 10.1.0-M16-jdk17-temurin-focal, 10.1.0-jdk17-temurin-focal, 10.1-jdk17-temurin-focal, 10.1.0-M16-jdk17-temurin, 10.1.0-jdk17-temurin, 10.1-jdk17-temurin, 10.1.0-M16-jdk17, 10.1.0-jdk17, 10.1-jdk17, 10.1.0-M16, 10.1.0, 10.1
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jdk17/temurin-focal
 
-Tags: 10.1.0-M16-jre11-openjdk-bullseye, 10.1.0-jre11-openjdk-bullseye, 10.1-jre11-openjdk-bullseye, 10.1.0-M16-jre11-openjdk, 10.1.0-jre11-openjdk, 10.1-jre11-openjdk, 10.1.0-M16-jre11, 10.1.0-jre11, 10.1-jre11
+Tags: 10.1.0-M16-jre11-openjdk-bullseye, 10.1.0-jre11-openjdk-bullseye, 10.1-jre11-openjdk-bullseye, 10.1.0-M16-jre11-openjdk, 10.1.0-jre11-openjdk, 10.1-jre11-openjdk
 Architectures: amd64, arm64v8
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jre11/openjdk-bullseye
@@ -436,12 +436,12 @@
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jre11/openjdk-slim-buster
 
-Tags: 10.1.0-M16-jre11-temurin-focal, 10.1.0-jre11-temurin-focal, 10.1-jre11-temurin-focal, 10.1.0-M16-jre11-temurin, 10.1.0-jre11-temurin, 10.1-jre11-temurin
+Tags: 10.1.0-M16-jre11-temurin-focal, 10.1.0-jre11-temurin-focal, 10.1-jre11-temurin-focal, 10.1.0-M16-jre11-temurin, 10.1.0-jre11-temurin, 10.1-jre11-temurin, 10.1.0-M16-jre11, 10.1.0-jre11, 10.1-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jre11/temurin-focal
 
-Tags: 10.1.0-M16-jre17-temurin-focal, 10.1.0-jre17-temurin-focal, 10.1-jre17-temurin-focal, 10.1.0-M16-jre17-temurin, 10.1.0-jre17-temurin, 10.1-jre17-temurin
+Tags: 10.1.0-M16-jre17-temurin-focal, 10.1.0-jre17-temurin-focal, 10.1-jre17-temurin-focal, 10.1.0-M16-jre17-temurin, 10.1.0-jre17-temurin, 10.1-jre17-temurin, 10.1.0-M16-jre17, 10.1.0-jre17, 10.1-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 405988ea1b223149948c64867f75854e3adadc1e
 Directory: 10.1/jre17/temurin-focal

@tianon
Copy link
Member Author

tianon commented Jun 16, 2022

CI failures got me like

Ryan Reynolds: "ugh"

@yosifkit yosifkit merged commit 7c90416 into docker-library:master Jun 16, 2022
@yosifkit yosifkit deleted the temurin branch June 16, 2022 23:06
@tianon
Copy link
Member Author

tianon commented Jun 16, 2022

Ooh, this also helps with docker-library/openjdk#495 👀

(Which is ultimately the same underlying problem)

docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 17, 2022
@docker-library-bot
Update tomcat
df7294e 
Changes:

- docker-library/tomcat@7c90416: Merge pull request docker-library/tomcat#265 from infosiftr/temurin
- docker-library/tomcat@ed54ae6: Switch "latest" variants from OpenJDK to Temurin
- docker-library/tomcat@5c5963e: Remove 16 from attempted JDK variants
This was referenced Jun 21, 2022
Merged
Closed
@wglambert wglambert mentioned this pull request Jul 5, 2022
Closed
@tianon tianon mentioned this pull request Jul 11, 2022
Merged
BaurzhanSakhariev pushed a commit to crate/official-images that referenced this pull request Jul 18, 2022
@docker-library-bot @BaurzhanSakhariev
Update tomcat
a78bc98 
Changes:

- docker-library/tomcat@7c90416: Merge pull request docker-library/tomcat#265 from infosiftr/temurin
- docker-library/tomcat@ed54ae6: Switch "latest" variants from OpenJDK to Temurin
- docker-library/tomcat@5c5963e: Remove 16 from attempted JDK variants
@tianon tianon mentioned this pull request Sep 22, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tianon @yosifkit