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

Update tomcat #12667

Merged
merged 1 commit into from
Jun 21, 2022
Merged

Update tomcat #12667

merged 1 commit into from
Jun 21, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 21, 2022

Changes:

@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
@github-actions
Copy link

Diff for df7294e: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index a03f048..ed419d6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,7 +6,7 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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 @@ Architectures: amd64, arm64v8
 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
diff --git a/_bashbrew-list b/_bashbrew-list
index 6cf4585..0416c48 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -19,6 +19,7 @@ tomcat:8-jdk11-openjdk-slim-bullseye
 tomcat:8-jdk11-openjdk-slim-buster
 tomcat:8-jdk11-temurin
 tomcat:8-jdk11-temurin-focal
+tomcat:8-jdk17
 tomcat:8-jdk17-corretto
 tomcat:8-jdk17-temurin
 tomcat:8-jdk17-temurin-focal
@@ -40,6 +41,7 @@ tomcat:8-jre11-openjdk-slim-bullseye
 tomcat:8-jre11-openjdk-slim-buster
 tomcat:8-jre11-temurin
 tomcat:8-jre11-temurin-focal
+tomcat:8-jre17
 tomcat:8-jre17-temurin
 tomcat:8-jre17-temurin-focal
 tomcat:8.5
@@ -63,6 +65,7 @@ tomcat:8.5-jdk11-openjdk-slim-bullseye
 tomcat:8.5-jdk11-openjdk-slim-buster
 tomcat:8.5-jdk11-temurin
 tomcat:8.5-jdk11-temurin-focal
+tomcat:8.5-jdk17
 tomcat:8.5-jdk17-corretto
 tomcat:8.5-jdk17-temurin
 tomcat:8.5-jdk17-temurin-focal
@@ -84,6 +87,7 @@ tomcat:8.5-jre11-openjdk-slim-bullseye
 tomcat:8.5-jre11-openjdk-slim-buster
 tomcat:8.5-jre11-temurin
 tomcat:8.5-jre11-temurin-focal
+tomcat:8.5-jre17
 tomcat:8.5-jre17-temurin
 tomcat:8.5-jre17-temurin-focal
 tomcat:8.5.81
@@ -107,6 +111,7 @@ tomcat:8.5.81-jdk11-openjdk-slim-bullseye
 tomcat:8.5.81-jdk11-openjdk-slim-buster
 tomcat:8.5.81-jdk11-temurin
 tomcat:8.5.81-jdk11-temurin-focal
+tomcat:8.5.81-jdk17
 tomcat:8.5.81-jdk17-corretto
 tomcat:8.5.81-jdk17-temurin
 tomcat:8.5.81-jdk17-temurin-focal
@@ -128,6 +133,7 @@ tomcat:8.5.81-jre11-openjdk-slim-bullseye
 tomcat:8.5.81-jre11-openjdk-slim-buster
 tomcat:8.5.81-jre11-temurin
 tomcat:8.5.81-jre11-temurin-focal
+tomcat:8.5.81-jre17
 tomcat:8.5.81-jre17-temurin
 tomcat:8.5.81-jre17-temurin-focal
 tomcat:9
@@ -151,6 +157,7 @@ tomcat:9-jdk11-openjdk-slim-bullseye
 tomcat:9-jdk11-openjdk-slim-buster
 tomcat:9-jdk11-temurin
 tomcat:9-jdk11-temurin-focal
+tomcat:9-jdk17
 tomcat:9-jdk17-corretto
 tomcat:9-jdk17-temurin
 tomcat:9-jdk17-temurin-focal
@@ -172,6 +179,7 @@ tomcat:9-jre11-openjdk-slim-bullseye
 tomcat:9-jre11-openjdk-slim-buster
 tomcat:9-jre11-temurin
 tomcat:9-jre11-temurin-focal
+tomcat:9-jre17
 tomcat:9-jre17-temurin
 tomcat:9-jre17-temurin-focal
 tomcat:9.0
@@ -195,6 +203,7 @@ tomcat:9.0-jdk11-openjdk-slim-bullseye
 tomcat:9.0-jdk11-openjdk-slim-buster
 tomcat:9.0-jdk11-temurin
 tomcat:9.0-jdk11-temurin-focal
+tomcat:9.0-jdk17
 tomcat:9.0-jdk17-corretto
 tomcat:9.0-jdk17-temurin
 tomcat:9.0-jdk17-temurin-focal
@@ -216,6 +225,7 @@ tomcat:9.0-jre11-openjdk-slim-bullseye
 tomcat:9.0-jre11-openjdk-slim-buster
 tomcat:9.0-jre11-temurin
 tomcat:9.0-jre11-temurin-focal
+tomcat:9.0-jre17
 tomcat:9.0-jre17-temurin
 tomcat:9.0-jre17-temurin-focal
 tomcat:9.0.64
@@ -239,6 +249,7 @@ tomcat:9.0.64-jdk11-openjdk-slim-bullseye
 tomcat:9.0.64-jdk11-openjdk-slim-buster
 tomcat:9.0.64-jdk11-temurin
 tomcat:9.0.64-jdk11-temurin-focal
+tomcat:9.0.64-jdk17
 tomcat:9.0.64-jdk17-corretto
 tomcat:9.0.64-jdk17-temurin
 tomcat:9.0.64-jdk17-temurin-focal
@@ -260,6 +271,7 @@ tomcat:9.0.64-jre11-openjdk-slim-bullseye
 tomcat:9.0.64-jre11-openjdk-slim-buster
 tomcat:9.0.64-jre11-temurin
 tomcat:9.0.64-jre11-temurin-focal
+tomcat:9.0.64-jre17
 tomcat:9.0.64-jre17-temurin
 tomcat:9.0.64-jre17-temurin-focal
 tomcat:10
@@ -283,6 +295,7 @@ tomcat:10-jdk11-openjdk-slim-bullseye
 tomcat:10-jdk11-openjdk-slim-buster
 tomcat:10-jdk11-temurin
 tomcat:10-jdk11-temurin-focal
+tomcat:10-jdk17
 tomcat:10-jdk17-corretto
 tomcat:10-jdk17-temurin
 tomcat:10-jdk17-temurin-focal
@@ -304,6 +317,7 @@ tomcat:10-jre11-openjdk-slim-bullseye
 tomcat:10-jre11-openjdk-slim-buster
 tomcat:10-jre11-temurin
 tomcat:10-jre11-temurin-focal
+tomcat:10-jre17
 tomcat:10-jre17-temurin
 tomcat:10-jre17-temurin-focal
 tomcat:10.0
@@ -327,6 +341,7 @@ tomcat:10.0-jdk11-openjdk-slim-bullseye
 tomcat:10.0-jdk11-openjdk-slim-buster
 tomcat:10.0-jdk11-temurin
 tomcat:10.0-jdk11-temurin-focal
+tomcat:10.0-jdk17
 tomcat:10.0-jdk17-corretto
 tomcat:10.0-jdk17-temurin
 tomcat:10.0-jdk17-temurin-focal
@@ -348,6 +363,7 @@ tomcat:10.0-jre11-openjdk-slim-bullseye
 tomcat:10.0-jre11-openjdk-slim-buster
 tomcat:10.0-jre11-temurin
 tomcat:10.0-jre11-temurin-focal
+tomcat:10.0-jre17
 tomcat:10.0-jre17-temurin
 tomcat:10.0-jre17-temurin-focal
 tomcat:10.0.22
@@ -371,6 +387,7 @@ tomcat:10.0.22-jdk11-openjdk-slim-bullseye
 tomcat:10.0.22-jdk11-openjdk-slim-buster
 tomcat:10.0.22-jdk11-temurin
 tomcat:10.0.22-jdk11-temurin-focal
+tomcat:10.0.22-jdk17
 tomcat:10.0.22-jdk17-corretto
 tomcat:10.0.22-jdk17-temurin
 tomcat:10.0.22-jdk17-temurin-focal
@@ -392,6 +409,7 @@ tomcat:10.0.22-jre11-openjdk-slim-bullseye
 tomcat:10.0.22-jre11-openjdk-slim-buster
 tomcat:10.0.22-jre11-temurin
 tomcat:10.0.22-jre11-temurin-focal
+tomcat:10.0.22-jre17
 tomcat:10.0.22-jre17-temurin
 tomcat:10.0.22-jre17-temurin-focal
 tomcat:10.1
@@ -405,6 +423,7 @@ tomcat:10.1-jdk11-openjdk-slim-bullseye
 tomcat:10.1-jdk11-openjdk-slim-buster
 tomcat:10.1-jdk11-temurin
 tomcat:10.1-jdk11-temurin-focal
+tomcat:10.1-jdk17
 tomcat:10.1-jdk17-corretto
 tomcat:10.1-jdk17-temurin
 tomcat:10.1-jdk17-temurin-focal
@@ -417,6 +436,7 @@ tomcat:10.1-jre11-openjdk-slim-bullseye
 tomcat:10.1-jre11-openjdk-slim-buster
 tomcat:10.1-jre11-temurin
 tomcat:10.1-jre11-temurin-focal
+tomcat:10.1-jre17
 tomcat:10.1-jre17-temurin
 tomcat:10.1-jre17-temurin-focal
 tomcat:10.1.0
@@ -431,6 +451,7 @@ tomcat:10.1.0-M16-jdk11-openjdk-slim-bullseye
 tomcat:10.1.0-M16-jdk11-openjdk-slim-buster
 tomcat:10.1.0-M16-jdk11-temurin
 tomcat:10.1.0-M16-jdk11-temurin-focal
+tomcat:10.1.0-M16-jdk17
 tomcat:10.1.0-M16-jdk17-corretto
 tomcat:10.1.0-M16-jdk17-temurin
 tomcat:10.1.0-M16-jdk17-temurin-focal
@@ -443,6 +464,7 @@ tomcat:10.1.0-M16-jre11-openjdk-slim-bullseye
 tomcat:10.1.0-M16-jre11-openjdk-slim-buster
 tomcat:10.1.0-M16-jre11-temurin
 tomcat:10.1.0-M16-jre11-temurin-focal
+tomcat:10.1.0-M16-jre17
 tomcat:10.1.0-M16-jre17-temurin
 tomcat:10.1.0-M16-jre17-temurin-focal
 tomcat:10.1.0-jdk11
@@ -455,6 +477,7 @@ tomcat:10.1.0-jdk11-openjdk-slim-bullseye
 tomcat:10.1.0-jdk11-openjdk-slim-buster
 tomcat:10.1.0-jdk11-temurin
 tomcat:10.1.0-jdk11-temurin-focal
+tomcat:10.1.0-jdk17
 tomcat:10.1.0-jdk17-corretto
 tomcat:10.1.0-jdk17-temurin
 tomcat:10.1.0-jdk17-temurin-focal
@@ -467,6 +490,7 @@ tomcat:10.1.0-jre11-openjdk-slim-bullseye
 tomcat:10.1.0-jre11-openjdk-slim-buster
 tomcat:10.1.0-jre11-temurin
 tomcat:10.1.0-jre11-temurin-focal
+tomcat:10.1.0-jre17
 tomcat:10.1.0-jre17-temurin
 tomcat:10.1.0-jre17-temurin-focal
 tomcat:jdk8
@@ -489,6 +513,7 @@ tomcat:jdk11-openjdk-slim-bullseye
 tomcat:jdk11-openjdk-slim-buster
 tomcat:jdk11-temurin
 tomcat:jdk11-temurin-focal
+tomcat:jdk17
 tomcat:jdk17-corretto
 tomcat:jdk17-temurin
 tomcat:jdk17-temurin-focal
@@ -510,6 +535,7 @@ tomcat:jre11-openjdk-slim-bullseye
 tomcat:jre11-openjdk-slim-buster
 tomcat:jre11-temurin
 tomcat:jre11-temurin-focal
+tomcat:jre17
 tomcat:jre17-temurin
 tomcat:jre17-temurin-focal
 tomcat:latest
diff --git a/tomcat_10.1/Dockerfile b/tomcat_10.1-jdk11-openjdk/Dockerfile
similarity index 100%
copy from tomcat_10.1/Dockerfile
copy to tomcat_10.1-jdk11-openjdk/Dockerfile
diff --git a/tomcat_10.1-jdk11-temurin/Dockerfile b/tomcat_10.1-jdk11/Dockerfile
similarity index 100%
rename from tomcat_10.1-jdk11-temurin/Dockerfile
rename to tomcat_10.1-jdk11/Dockerfile
diff --git a/tomcat_10.1-jdk17-temurin/Dockerfile b/tomcat_10.1-jdk17-temurin/Dockerfile
deleted file mode 100644
index 54153c7..0000000
diff --git a/tomcat_10.1-jre11/Dockerfile b/tomcat_10.1-jre11-openjdk/Dockerfile
similarity index 100%
copy from tomcat_10.1-jre11/Dockerfile
copy to tomcat_10.1-jre11-openjdk/Dockerfile
diff --git a/tomcat_10.1-jre11-temurin/Dockerfile b/tomcat_10.1-jre11-temurin/Dockerfile
deleted file mode 100644
index 9e95efc..0000000
diff --git a/tomcat_10.1-jre11/Dockerfile b/tomcat_10.1-jre11/Dockerfile
index 7f815c6..9e95efc 100644
--- a/tomcat_10.1-jre11/Dockerfile
+++ b/tomcat_10.1-jre11/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:11-jre-bullseye
+FROM eclipse-temurin:11-jre-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 10
 ENV TOMCAT_VERSION 10.1.0-M16
 ENV TOMCAT_SHA512 ad25f3393324ce42619d6aeeb685186322776b5ba4583453c5e16957fa71cd64fa9f30e379985d57a701be43e9475991312893ee87979e69dd2b51de06510060
 
-COPY --from=tomcat:10.1.0-M16-jdk11-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.0-M16-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_10.1-jre17-temurin/Dockerfile b/tomcat_10.1-jre17/Dockerfile
similarity index 100%
rename from tomcat_10.1-jre17-temurin/Dockerfile
rename to tomcat_10.1-jre17/Dockerfile
diff --git a/tomcat_10.1/Dockerfile b/tomcat_10.1/Dockerfile
index 68088c3..54153c7 100644
--- a/tomcat_10.1/Dockerfile
+++ b/tomcat_10.1/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:11-jdk-bullseye
+FROM eclipse-temurin:17-jdk-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_8/Dockerfile b/tomcat_8-jdk11-openjdk/Dockerfile
similarity index 100%
copy from tomcat_8/Dockerfile
copy to tomcat_8-jdk11-openjdk/Dockerfile
diff --git a/tomcat_8-jdk11-temurin/Dockerfile b/tomcat_8-jdk11/Dockerfile
similarity index 100%
rename from tomcat_8-jdk11-temurin/Dockerfile
rename to tomcat_8-jdk11/Dockerfile
diff --git a/tomcat_8-jdk17-temurin/Dockerfile b/tomcat_8-jdk17-temurin/Dockerfile
deleted file mode 100644
index de642d1..0000000
diff --git a/tomcat_8-jdk8/Dockerfile b/tomcat_8-jdk8-openjdk/Dockerfile
similarity index 100%
copy from tomcat_8-jdk8/Dockerfile
copy to tomcat_8-jdk8-openjdk/Dockerfile
diff --git a/tomcat_8-jdk8-temurin/Dockerfile b/tomcat_8-jdk8-temurin/Dockerfile
deleted file mode 100644
index 3e4cb9d..0000000
diff --git a/tomcat_8-jdk8/Dockerfile b/tomcat_8-jdk8/Dockerfile
index f36c5b6..3e4cb9d 100644
--- a/tomcat_8-jdk8/Dockerfile
+++ b/tomcat_8-jdk8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:8-jdk-bullseye
+FROM eclipse-temurin:8-jdk-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_8-jre11/Dockerfile b/tomcat_8-jre11-openjdk/Dockerfile
similarity index 100%
copy from tomcat_8-jre11/Dockerfile
copy to tomcat_8-jre11-openjdk/Dockerfile
diff --git a/tomcat_8-jre11-temurin/Dockerfile b/tomcat_8-jre11-temurin/Dockerfile
deleted file mode 100644
index 80d09e9..0000000
diff --git a/tomcat_8-jre11/Dockerfile b/tomcat_8-jre11/Dockerfile
index ffedd04..80d09e9 100644
--- a/tomcat_8-jre11/Dockerfile
+++ b/tomcat_8-jre11/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:11-jre-bullseye
+FROM eclipse-temurin:11-jre-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.81
 ENV TOMCAT_SHA512 729387275cce4a0900289722f6c70ebcf7aee924af671b110b8ea8577fd6d045d47f17d526c8db5fd41c8590102e7f5100e95e89f7fd511b941565812ecbed35
 
-COPY --from=tomcat:8.5.81-jdk11-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.81-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8-jre17-temurin/Dockerfile b/tomcat_8-jre17/Dockerfile
similarity index 100%
rename from tomcat_8-jre17-temurin/Dockerfile
rename to tomcat_8-jre17/Dockerfile
diff --git a/tomcat_8-jre8/Dockerfile b/tomcat_8-jre8-openjdk/Dockerfile
similarity index 100%
copy from tomcat_8-jre8/Dockerfile
copy to tomcat_8-jre8-openjdk/Dockerfile
diff --git a/tomcat_8-jre8-temurin/Dockerfile b/tomcat_8-jre8-temurin/Dockerfile
deleted file mode 100644
index a0162c8..0000000
diff --git a/tomcat_8-jre8/Dockerfile b/tomcat_8-jre8/Dockerfile
index ec0c74d..a0162c8 100644
--- a/tomcat_8-jre8/Dockerfile
+++ b/tomcat_8-jre8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:8-jre-bullseye
+FROM eclipse-temurin:8-jre-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 8
 ENV TOMCAT_VERSION 8.5.81
 ENV TOMCAT_SHA512 729387275cce4a0900289722f6c70ebcf7aee924af671b110b8ea8577fd6d045d47f17d526c8db5fd41c8590102e7f5100e95e89f7fd511b941565812ecbed35
 
-COPY --from=tomcat:8.5.81-jdk8-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:8.5.81-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_8/Dockerfile b/tomcat_8/Dockerfile
index f7915a9..de642d1 100644
--- a/tomcat_8/Dockerfile
+++ b/tomcat_8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:11-jdk-bullseye
+FROM eclipse-temurin:17-jdk-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9/Dockerfile b/tomcat_9-jdk11-openjdk/Dockerfile
similarity index 100%
copy from tomcat_9/Dockerfile
copy to tomcat_9-jdk11-openjdk/Dockerfile
diff --git a/tomcat_9-jdk11-temurin/Dockerfile b/tomcat_9-jdk11/Dockerfile
similarity index 100%
rename from tomcat_9-jdk11-temurin/Dockerfile
rename to tomcat_9-jdk11/Dockerfile
diff --git a/tomcat_9-jdk17-temurin/Dockerfile b/tomcat_9-jdk17-temurin/Dockerfile
deleted file mode 100644
index 91b28f3..0000000
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk8-openjdk/Dockerfile
similarity index 100%
copy from tomcat_9-jdk8/Dockerfile
copy to tomcat_9-jdk8-openjdk/Dockerfile
diff --git a/tomcat_9-jdk8-temurin/Dockerfile b/tomcat_9-jdk8-temurin/Dockerfile
deleted file mode 100644
index 976ebb1..0000000
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk8/Dockerfile
index 2315bf3..976ebb1 100644
--- a/tomcat_9-jdk8/Dockerfile
+++ b/tomcat_9-jdk8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:8-jdk-bullseye
+FROM eclipse-temurin:8-jdk-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9-jre11/Dockerfile b/tomcat_9-jre11-openjdk/Dockerfile
similarity index 100%
copy from tomcat_9-jre11/Dockerfile
copy to tomcat_9-jre11-openjdk/Dockerfile
diff --git a/tomcat_9-jre11-temurin/Dockerfile b/tomcat_9-jre11-temurin/Dockerfile
deleted file mode 100644
index 11d8192..0000000
diff --git a/tomcat_9-jre11/Dockerfile b/tomcat_9-jre11/Dockerfile
index 843d0f4..11d8192 100644
--- a/tomcat_9-jre11/Dockerfile
+++ b/tomcat_9-jre11/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:11-jre-bullseye
+FROM eclipse-temurin:11-jre-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.64
 ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
 
-COPY --from=tomcat:9.0.64-jdk11-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.64-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9-jre17-temurin/Dockerfile b/tomcat_9-jre17/Dockerfile
similarity index 100%
rename from tomcat_9-jre17-temurin/Dockerfile
rename to tomcat_9-jre17/Dockerfile
diff --git a/tomcat_9-jre8/Dockerfile b/tomcat_9-jre8-openjdk/Dockerfile
similarity index 100%
copy from tomcat_9-jre8/Dockerfile
copy to tomcat_9-jre8-openjdk/Dockerfile
diff --git a/tomcat_9-jre8-temurin/Dockerfile b/tomcat_9-jre8-temurin/Dockerfile
deleted file mode 100644
index c8c5c39..0000000
diff --git a/tomcat_9-jre8/Dockerfile b/tomcat_9-jre8/Dockerfile
index 22fdf11..c8c5c39 100644
--- a/tomcat_9-jre8/Dockerfile
+++ b/tomcat_9-jre8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:8-jre-bullseye
+FROM eclipse-temurin:8-jre-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 9
 ENV TOMCAT_VERSION 9.0.64
 ENV TOMCAT_SHA512 38392b651fabe706fb0524c52849601299494178010bb8077af383232c20bbbda1aec4ab8898adb2cc37c07583ff0e9d3c7038ce55a22bc68c3641641b47fd1a
 
-COPY --from=tomcat:9.0.64-jdk8-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.64-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_9/Dockerfile b/tomcat_9/Dockerfile
index aa43b41..91b28f3 100644
--- a/tomcat_9/Dockerfile
+++ b/tomcat_9/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:11-jdk-bullseye
+FROM eclipse-temurin:17-jdk-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_latest/Dockerfile b/tomcat_jdk11-openjdk/Dockerfile
similarity index 100%
copy from tomcat_latest/Dockerfile
copy to tomcat_jdk11-openjdk/Dockerfile
diff --git a/tomcat_jdk11-temurin/Dockerfile b/tomcat_jdk11/Dockerfile
similarity index 100%
rename from tomcat_jdk11-temurin/Dockerfile
rename to tomcat_jdk11/Dockerfile
diff --git a/tomcat_jdk17-temurin/Dockerfile b/tomcat_jdk17-temurin/Dockerfile
deleted file mode 100644
index bdc8a26..0000000
diff --git a/tomcat_jdk8/Dockerfile b/tomcat_jdk8-openjdk/Dockerfile
similarity index 100%
copy from tomcat_jdk8/Dockerfile
copy to tomcat_jdk8-openjdk/Dockerfile
diff --git a/tomcat_jdk8-temurin/Dockerfile b/tomcat_jdk8-temurin/Dockerfile
deleted file mode 100644
index b5de92a..0000000
diff --git a/tomcat_jdk8/Dockerfile b/tomcat_jdk8/Dockerfile
index aac62eb..b5de92a 100644
--- a/tomcat_jdk8/Dockerfile
+++ b/tomcat_jdk8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:8-jdk-bullseye
+FROM eclipse-temurin:8-jdk-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11-openjdk/Dockerfile
similarity index 100%
copy from tomcat_jre11/Dockerfile
copy to tomcat_jre11-openjdk/Dockerfile
diff --git a/tomcat_jre11-temurin/Dockerfile b/tomcat_jre11-temurin/Dockerfile
deleted file mode 100644
index 4c93a61..0000000
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11/Dockerfile
index caf3487..4c93a61 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_jre11/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:11-jre-bullseye
+FROM eclipse-temurin:11-jre-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 10
 ENV TOMCAT_VERSION 10.0.22
 ENV TOMCAT_SHA512 fe46db8794f066882b30e7a94bd8d3dbcf29e8e8ffaf67c1355846755745a7c9eafd124819283f218bcf410921a485b44b57b56fd6251fb99d67d95f3dd36826
 
-COPY --from=tomcat:10.0.22-jdk11-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.0.22-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_jre17-temurin/Dockerfile b/tomcat_jre17/Dockerfile
similarity index 100%
rename from tomcat_jre17-temurin/Dockerfile
rename to tomcat_jre17/Dockerfile
diff --git a/tomcat_jre8/Dockerfile b/tomcat_jre8-openjdk/Dockerfile
similarity index 100%
copy from tomcat_jre8/Dockerfile
copy to tomcat_jre8-openjdk/Dockerfile
diff --git a/tomcat_jre8-temurin/Dockerfile b/tomcat_jre8-temurin/Dockerfile
deleted file mode 100644
index 1f1dec7..0000000
diff --git a/tomcat_jre8/Dockerfile b/tomcat_jre8/Dockerfile
index b3764c1..1f1dec7 100644
--- a/tomcat_jre8/Dockerfile
+++ b/tomcat_jre8/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:8-jre-bullseye
+FROM eclipse-temurin:8-jre-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,7 +23,7 @@ ENV TOMCAT_MAJOR 10
 ENV TOMCAT_VERSION 10.0.22
 ENV TOMCAT_SHA512 fe46db8794f066882b30e7a94bd8d3dbcf29e8e8ffaf67c1355846755745a7c9eafd124819283f218bcf410921a485b44b57b56fd6251fb99d67d95f3dd36826
 
-COPY --from=tomcat:10.0.22-jdk8-openjdk-bullseye $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.0.22-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
 RUN set -eux; \
 	apt-get update; \
 	xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
diff --git a/tomcat_latest/Dockerfile b/tomcat_latest/Dockerfile
index ee8c2d7..bdc8a26 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_latest/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM openjdk:11-jdk-bullseye
+FROM eclipse-temurin:17-jdk-focal
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH

Relevant Maintainers:

@yosifkit yosifkit merged commit d38ae10 into docker-library:master Jun 21, 2022
@yosifkit yosifkit deleted the tomcat branch June 21, 2022 23:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/tomcat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @docker-library-bot