Update tomcat #14844
Merged
Update tomcat #14844
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/tomcat@16a2137: Add OpenJDK 21 (EA) + bookworm, which allows update to 11.0.0-M7
Diff for 0c35a34:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ae2c1e1..62da099 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -46,6 +46,26 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 2b200acb84bebc3e867f32e3b64f19620aa60b58
Directory: 8.5/jdk17/temurin-jammy
+Tags: 8.5.90-jdk21-openjdk-bookworm, 8.5-jdk21-openjdk-bookworm, 8-jdk21-openjdk-bookworm, 8.5.90-jdk21-openjdk, 8.5-jdk21-openjdk, 8-jdk21-openjdk
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 8.5/jdk21/openjdk-bookworm
+
+Tags: 8.5.90-jdk21-openjdk-bullseye, 8.5-jdk21-openjdk-bullseye, 8-jdk21-openjdk-bullseye
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 8.5/jdk21/openjdk-bullseye
+
+Tags: 8.5.90-jdk21-openjdk-slim-bookworm, 8.5-jdk21-openjdk-slim-bookworm, 8-jdk21-openjdk-slim-bookworm, 8.5.90-jdk21-openjdk-slim, 8.5-jdk21-openjdk-slim, 8-jdk21-openjdk-slim
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 8.5/jdk21/openjdk-slim-bookworm
+
+Tags: 8.5.90-jdk21-openjdk-slim-bullseye, 8.5-jdk21-openjdk-slim-bullseye, 8-jdk21-openjdk-slim-bullseye
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 8.5/jdk21/openjdk-slim-bullseye
+
Tags: 8.5.90-jre8-temurin-focal, 8.5-jre8-temurin-focal, 8-jre8-temurin-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le
GitCommit: 2b200acb84bebc3e867f32e3b64f19620aa60b58
@@ -121,6 +141,26 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: 1c6875e85a440757bf983b3beb6234f23cc06e8c
Directory: 9.0/jdk17/temurin-jammy
+Tags: 9.0.76-jdk21-openjdk-bookworm, 9.0-jdk21-openjdk-bookworm, 9-jdk21-openjdk-bookworm, 9.0.76-jdk21-openjdk, 9.0-jdk21-openjdk, 9-jdk21-openjdk
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 9.0/jdk21/openjdk-bookworm
+
+Tags: 9.0.76-jdk21-openjdk-bullseye, 9.0-jdk21-openjdk-bullseye, 9-jdk21-openjdk-bullseye
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 9.0/jdk21/openjdk-bullseye
+
+Tags: 9.0.76-jdk21-openjdk-slim-bookworm, 9.0-jdk21-openjdk-slim-bookworm, 9-jdk21-openjdk-slim-bookworm, 9.0.76-jdk21-openjdk-slim, 9.0-jdk21-openjdk-slim, 9-jdk21-openjdk-slim
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 9.0/jdk21/openjdk-slim-bookworm
+
+Tags: 9.0.76-jdk21-openjdk-slim-bullseye, 9.0-jdk21-openjdk-slim-bullseye, 9-jdk21-openjdk-slim-bullseye
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 9.0/jdk21/openjdk-slim-bullseye
+
Tags: 9.0.76-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le
GitCommit: 1c6875e85a440757bf983b3beb6234f23cc06e8c
@@ -161,6 +201,16 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: cec66ee6d87cce2308d454b47bb7addbb9ace087
Directory: 10.1/jdk17/temurin-jammy
+Tags: 10.1.10-jdk21-openjdk-bookworm, 10.1-jdk21-openjdk-bookworm, 10-jdk21-openjdk-bookworm, jdk21-openjdk-bookworm, 10.1.10-jdk21-openjdk, 10.1-jdk21-openjdk, 10-jdk21-openjdk, jdk21-openjdk
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 10.1/jdk21/openjdk-bookworm
+
+Tags: 10.1.10-jdk21-openjdk-slim-bookworm, 10.1-jdk21-openjdk-slim-bookworm, 10-jdk21-openjdk-slim-bookworm, jdk21-openjdk-slim-bookworm, 10.1.10-jdk21-openjdk-slim, 10.1-jdk21-openjdk-slim, 10-jdk21-openjdk-slim, jdk21-openjdk-slim
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 10.1/jdk21/openjdk-slim-bookworm
+
Tags: 10.1.10-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.10-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.10-jre11, 10.1-jre11, 10-jre11, jre11
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: cec66ee6d87cce2308d454b47bb7addbb9ace087
@@ -171,12 +221,12 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
GitCommit: cec66ee6d87cce2308d454b47bb7addbb9ace087
Directory: 10.1/jre17/temurin-jammy
-Tags: 11.0.0-M6-jdk17-temurin-jammy, 11.0.0-jdk17-temurin-jammy, 11.0-jdk17-temurin-jammy, 11.0.0-M6-jdk17-temurin, 11.0.0-jdk17-temurin, 11.0-jdk17-temurin, 11.0.0-M6-jdk17, 11.0.0-jdk17, 11.0-jdk17, 11.0.0-M6, 11.0.0, 11.0
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 67e71978df0c16df45ab4364a10d9239fc7869d3
-Directory: 11.0/jdk17/temurin-jammy
+Tags: 11.0.0-M7-jdk21-openjdk-bookworm, 11.0.0-jdk21-openjdk-bookworm, 11.0-jdk21-openjdk-bookworm, 11.0.0-M7-jdk21-openjdk, 11.0.0-jdk21-openjdk, 11.0-jdk21-openjdk
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 11.0/jdk21/openjdk-bookworm
-Tags: 11.0.0-M6-jre17-temurin-jammy, 11.0.0-jre17-temurin-jammy, 11.0-jre17-temurin-jammy, 11.0.0-M6-jre17-temurin, 11.0.0-jre17-temurin, 11.0-jre17-temurin, 11.0.0-M6-jre17, 11.0.0-jre17, 11.0-jre17
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 67e71978df0c16df45ab4364a10d9239fc7869d3
-Directory: 11.0/jre17/temurin-jammy
+Tags: 11.0.0-M7-jdk21-openjdk-slim-bookworm, 11.0.0-jdk21-openjdk-slim-bookworm, 11.0-jdk21-openjdk-slim-bookworm, 11.0.0-M7-jdk21-openjdk-slim, 11.0.0-jdk21-openjdk-slim, 11.0-jdk21-openjdk-slim
+Architectures: amd64, arm64v8
+GitCommit: 16a2137a26ae88227d8bac176182235ad69c82b3
+Directory: 11.0/jdk21/openjdk-slim-bookworm
diff --git a/_bashbrew-list b/_bashbrew-list
index b0dfddb..08627c8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -17,6 +17,12 @@ tomcat:8-jdk17-corretto-al2
tomcat:8-jdk17-temurin
tomcat:8-jdk17-temurin-focal
tomcat:8-jdk17-temurin-jammy
+tomcat:8-jdk21-openjdk
+tomcat:8-jdk21-openjdk-bookworm
+tomcat:8-jdk21-openjdk-bullseye
+tomcat:8-jdk21-openjdk-slim
+tomcat:8-jdk21-openjdk-slim-bookworm
+tomcat:8-jdk21-openjdk-slim-bullseye
tomcat:8-jre8
tomcat:8-jre8-temurin
tomcat:8-jre8-temurin-focal
@@ -48,6 +54,12 @@ tomcat:8.5-jdk17-corretto-al2
tomcat:8.5-jdk17-temurin
tomcat:8.5-jdk17-temurin-focal
tomcat:8.5-jdk17-temurin-jammy
+tomcat:8.5-jdk21-openjdk
+tomcat:8.5-jdk21-openjdk-bookworm
+tomcat:8.5-jdk21-openjdk-bullseye
+tomcat:8.5-jdk21-openjdk-slim
+tomcat:8.5-jdk21-openjdk-slim-bookworm
+tomcat:8.5-jdk21-openjdk-slim-bullseye
tomcat:8.5-jre8
tomcat:8.5-jre8-temurin
tomcat:8.5-jre8-temurin-focal
@@ -79,6 +91,12 @@ tomcat:8.5.90-jdk17-corretto-al2
tomcat:8.5.90-jdk17-temurin
tomcat:8.5.90-jdk17-temurin-focal
tomcat:8.5.90-jdk17-temurin-jammy
+tomcat:8.5.90-jdk21-openjdk
+tomcat:8.5.90-jdk21-openjdk-bookworm
+tomcat:8.5.90-jdk21-openjdk-bullseye
+tomcat:8.5.90-jdk21-openjdk-slim
+tomcat:8.5.90-jdk21-openjdk-slim-bookworm
+tomcat:8.5.90-jdk21-openjdk-slim-bullseye
tomcat:8.5.90-jre8
tomcat:8.5.90-jre8-temurin
tomcat:8.5.90-jre8-temurin-focal
@@ -110,6 +128,12 @@ tomcat:9-jdk17-corretto-al2
tomcat:9-jdk17-temurin
tomcat:9-jdk17-temurin-focal
tomcat:9-jdk17-temurin-jammy
+tomcat:9-jdk21-openjdk
+tomcat:9-jdk21-openjdk-bookworm
+tomcat:9-jdk21-openjdk-bullseye
+tomcat:9-jdk21-openjdk-slim
+tomcat:9-jdk21-openjdk-slim-bookworm
+tomcat:9-jdk21-openjdk-slim-bullseye
tomcat:9-jre8
tomcat:9-jre8-temurin
tomcat:9-jre8-temurin-focal
@@ -141,6 +165,12 @@ tomcat:9.0-jdk17-corretto-al2
tomcat:9.0-jdk17-temurin
tomcat:9.0-jdk17-temurin-focal
tomcat:9.0-jdk17-temurin-jammy
+tomcat:9.0-jdk21-openjdk
+tomcat:9.0-jdk21-openjdk-bookworm
+tomcat:9.0-jdk21-openjdk-bullseye
+tomcat:9.0-jdk21-openjdk-slim
+tomcat:9.0-jdk21-openjdk-slim-bookworm
+tomcat:9.0-jdk21-openjdk-slim-bullseye
tomcat:9.0-jre8
tomcat:9.0-jre8-temurin
tomcat:9.0-jre8-temurin-focal
@@ -172,6 +202,12 @@ tomcat:9.0.76-jdk17-corretto-al2
tomcat:9.0.76-jdk17-temurin
tomcat:9.0.76-jdk17-temurin-focal
tomcat:9.0.76-jdk17-temurin-jammy
+tomcat:9.0.76-jdk21-openjdk
+tomcat:9.0.76-jdk21-openjdk-bookworm
+tomcat:9.0.76-jdk21-openjdk-bullseye
+tomcat:9.0.76-jdk21-openjdk-slim
+tomcat:9.0.76-jdk21-openjdk-slim-bookworm
+tomcat:9.0.76-jdk21-openjdk-slim-bullseye
tomcat:9.0.76-jre8
tomcat:9.0.76-jre8-temurin
tomcat:9.0.76-jre8-temurin-focal
@@ -191,6 +227,10 @@ tomcat:10-jdk11-temurin-jammy
tomcat:10-jdk17
tomcat:10-jdk17-temurin
tomcat:10-jdk17-temurin-jammy
+tomcat:10-jdk21-openjdk
+tomcat:10-jdk21-openjdk-bookworm
+tomcat:10-jdk21-openjdk-slim
+tomcat:10-jdk21-openjdk-slim-bookworm
tomcat:10-jre11
tomcat:10-jre11-temurin
tomcat:10-jre11-temurin-jammy
@@ -204,6 +244,10 @@ tomcat:10.1-jdk11-temurin-jammy
tomcat:10.1-jdk17
tomcat:10.1-jdk17-temurin
tomcat:10.1-jdk17-temurin-jammy
+tomcat:10.1-jdk21-openjdk
+tomcat:10.1-jdk21-openjdk-bookworm
+tomcat:10.1-jdk21-openjdk-slim
+tomcat:10.1-jdk21-openjdk-slim-bookworm
tomcat:10.1-jre11
tomcat:10.1-jre11-temurin
tomcat:10.1-jre11-temurin-jammy
@@ -217,39 +261,38 @@ tomcat:10.1.10-jdk11-temurin-jammy
tomcat:10.1.10-jdk17
tomcat:10.1.10-jdk17-temurin
tomcat:10.1.10-jdk17-temurin-jammy
+tomcat:10.1.10-jdk21-openjdk
+tomcat:10.1.10-jdk21-openjdk-bookworm
+tomcat:10.1.10-jdk21-openjdk-slim
+tomcat:10.1.10-jdk21-openjdk-slim-bookworm
tomcat:10.1.10-jre11
tomcat:10.1.10-jre11-temurin
tomcat:10.1.10-jre11-temurin-jammy
tomcat:10.1.10-jre17
tomcat:10.1.10-jre17-temurin
tomcat:10.1.10-jre17-temurin-jammy
-tomcat:11.0
-tomcat:11.0-jdk17
-tomcat:11.0-jdk17-temurin
-tomcat:11.0-jdk17-temurin-jammy
-tomcat:11.0-jre17
-tomcat:11.0-jre17-temurin
-tomcat:11.0-jre17-temurin-jammy
-tomcat:11.0.0
-tomcat:11.0.0-M6
-tomcat:11.0.0-M6-jdk17
-tomcat:11.0.0-M6-jdk17-temurin
-tomcat:11.0.0-M6-jdk17-temurin-jammy
-tomcat:11.0.0-M6-jre17
-tomcat:11.0.0-M6-jre17-temurin
-tomcat:11.0.0-M6-jre17-temurin-jammy
-tomcat:11.0.0-jdk17
-tomcat:11.0.0-jdk17-temurin
-tomcat:11.0.0-jdk17-temurin-jammy
-tomcat:11.0.0-jre17
-tomcat:11.0.0-jre17-temurin
-tomcat:11.0.0-jre17-temurin-jammy
+tomcat:11.0-jdk21-openjdk
+tomcat:11.0-jdk21-openjdk-bookworm
+tomcat:11.0-jdk21-openjdk-slim
+tomcat:11.0-jdk21-openjdk-slim-bookworm
+tomcat:11.0.0-M7-jdk21-openjdk
+tomcat:11.0.0-M7-jdk21-openjdk-bookworm
+tomcat:11.0.0-M7-jdk21-openjdk-slim
+tomcat:11.0.0-M7-jdk21-openjdk-slim-bookworm
+tomcat:11.0.0-jdk21-openjdk
+tomcat:11.0.0-jdk21-openjdk-bookworm
+tomcat:11.0.0-jdk21-openjdk-slim
+tomcat:11.0.0-jdk21-openjdk-slim-bookworm
tomcat:jdk11
tomcat:jdk11-temurin
tomcat:jdk11-temurin-jammy
tomcat:jdk17
tomcat:jdk17-temurin
tomcat:jdk17-temurin-jammy
+tomcat:jdk21-openjdk
+tomcat:jdk21-openjdk-bookworm
+tomcat:jdk21-openjdk-slim
+tomcat:jdk21-openjdk-slim-bookworm
tomcat:jre11
tomcat:jre11-temurin
tomcat:jre11-temurin-jammy
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 01cde6a..6e1ebe4 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -7,6 +7,10 @@ tomcat:8-jdk11
tomcat:8-jdk17-corretto
tomcat:8-jdk17-temurin-focal
tomcat:8
+tomcat:8-jdk21-openjdk
+tomcat:8-jdk21-openjdk-bullseye
+tomcat:8-jdk21-openjdk-slim
+tomcat:8-jdk21-openjdk-slim-bullseye
tomcat:8-jre8-temurin-focal
tomcat:8-jre8
tomcat:8-jre11-temurin-focal
@@ -22,6 +26,10 @@ tomcat:9-jdk11
tomcat:9-jdk17-corretto
tomcat:9-jdk17-temurin-focal
tomcat:9
+tomcat:9-jdk21-openjdk
+tomcat:9-jdk21-openjdk-bullseye
+tomcat:9-jdk21-openjdk-slim
+tomcat:9-jdk21-openjdk-slim-bullseye
tomcat:9-jre8-temurin-focal
tomcat:9-jre8
tomcat:9-jre11-temurin-focal
@@ -30,7 +38,9 @@ tomcat:9-jre17-temurin-focal
tomcat:9-jre17
tomcat:jdk11
tomcat:latest
+tomcat:jdk21-openjdk
+tomcat:jdk21-openjdk-slim
tomcat:jre11
tomcat:jre17
-tomcat:11.0
-tomcat:11.0-jre17
+tomcat:11.0-jdk21-openjdk
+tomcat:11.0-jdk21-openjdk-slim
diff --git a/tomcat_11.0/Dockerfile b/tomcat_11.0-jdk21-openjdk-slim/Dockerfile
similarity index 96%
copy from tomcat_11.0/Dockerfile
copy to tomcat_11.0-jdk21-openjdk-slim/Dockerfile
index d469974..b2f3e59 100644
--- a/tomcat_11.0/Dockerfile
+++ b/tomcat_11.0-jdk21-openjdk-slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:17-jdk-jammy
+FROM openjdk:21-jdk-slim-bookworm
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
ENV TOMCAT_MAJOR 11
-ENV TOMCAT_VERSION 11.0.0-M6
-ENV TOMCAT_SHA512 b3b5f0191fc87d50626101be9cf56cc31bb4fe9eb755a59e17a5786a40fe9241664942e95ddee7e7a155b2d26df1ee032bbab91936ccc42f4e3ffc12a8083658
+ENV TOMCAT_VERSION 11.0.0-M7
+ENV TOMCAT_SHA512 5cf6f732dbed858e255c5d82c624fedfb9cbb4e3af06503840d446b94ca7d8ba6a7e5328f7006fdc18fb6fab178948a33b47f6dff4d651893ac4d185713c0a21
RUN set -eux; \
\
diff --git a/tomcat_11.0/Dockerfile b/tomcat_11.0-jdk21-openjdk/Dockerfile
similarity index 96%
rename from tomcat_11.0/Dockerfile
rename to tomcat_11.0-jdk21-openjdk/Dockerfile
index d469974..8cb3a11 100644
--- a/tomcat_11.0/Dockerfile
+++ b/tomcat_11.0-jdk21-openjdk/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:17-jdk-jammy
+FROM openjdk:21-jdk-bookworm
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
ENV TOMCAT_MAJOR 11
-ENV TOMCAT_VERSION 11.0.0-M6
-ENV TOMCAT_SHA512 b3b5f0191fc87d50626101be9cf56cc31bb4fe9eb755a59e17a5786a40fe9241664942e95ddee7e7a155b2d26df1ee032bbab91936ccc42f4e3ffc12a8083658
+ENV TOMCAT_VERSION 11.0.0-M7
+ENV TOMCAT_SHA512 5cf6f732dbed858e255c5d82c624fedfb9cbb4e3af06503840d446b94ca7d8ba6a7e5328f7006fdc18fb6fab178948a33b47f6dff4d651893ac4d185713c0a21
RUN set -eux; \
\
diff --git a/tomcat_11.0-jre17/Dockerfile b/tomcat_11.0-jre17/Dockerfile
deleted file mode 100644
index 891f828..0000000
diff --git a/tomcat_8-jdk8/Dockerfile b/tomcat_8-jdk21-openjdk-bullseye/Dockerfile
similarity index 99%
copy from tomcat_8-jdk8/Dockerfile
copy to tomcat_8-jdk21-openjdk-bullseye/Dockerfile
index c6dc017..ffbec8a 100644
--- a/tomcat_8-jdk8/Dockerfile
+++ b/tomcat_8-jdk21-openjdk-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:8-jdk-jammy
+FROM openjdk:21-jdk-bullseye
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_8-jdk11/Dockerfile b/tomcat_8-jdk21-openjdk-slim-bullseye/Dockerfile
similarity index 99%
copy from tomcat_8-jdk11/Dockerfile
copy to tomcat_8-jdk21-openjdk-slim-bullseye/Dockerfile
index 18ffdb7..40ceb42 100644
--- a/tomcat_8-jdk11/Dockerfile
+++ b/tomcat_8-jdk21-openjdk-slim-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:11-jdk-jammy
+FROM openjdk:21-jdk-slim-bullseye
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_8-jdk11/Dockerfile b/tomcat_8-jdk21-openjdk-slim/Dockerfile
similarity index 99%
copy from tomcat_8-jdk11/Dockerfile
copy to tomcat_8-jdk21-openjdk-slim/Dockerfile
index 18ffdb7..c223a8e 100644
--- a/tomcat_8-jdk11/Dockerfile
+++ b/tomcat_8-jdk21-openjdk-slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:11-jdk-jammy
+FROM openjdk:21-jdk-slim-bookworm
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_8-jdk8/Dockerfile b/tomcat_8-jdk21-openjdk/Dockerfile
similarity index 99%
copy from tomcat_8-jdk8/Dockerfile
copy to tomcat_8-jdk21-openjdk/Dockerfile
index c6dc017..740981d 100644
--- a/tomcat_8-jdk8/Dockerfile
+++ b/tomcat_8-jdk21-openjdk/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:8-jdk-jammy
+FROM openjdk:21-jdk-bookworm
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk21-openjdk-bullseye/Dockerfile
similarity index 99%
copy from tomcat_9-jdk8/Dockerfile
copy to tomcat_9-jdk21-openjdk-bullseye/Dockerfile
index bf3bb05..b6b121c 100644
--- a/tomcat_9-jdk8/Dockerfile
+++ b/tomcat_9-jdk21-openjdk-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:8-jdk-jammy
+FROM openjdk:21-jdk-bullseye
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9-jdk11/Dockerfile b/tomcat_9-jdk21-openjdk-slim-bullseye/Dockerfile
similarity index 99%
copy from tomcat_9-jdk11/Dockerfile
copy to tomcat_9-jdk21-openjdk-slim-bullseye/Dockerfile
index 3bd2969..1390f46 100644
--- a/tomcat_9-jdk11/Dockerfile
+++ b/tomcat_9-jdk21-openjdk-slim-bullseye/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:11-jdk-jammy
+FROM openjdk:21-jdk-slim-bullseye
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9-jdk11/Dockerfile b/tomcat_9-jdk21-openjdk-slim/Dockerfile
similarity index 99%
copy from tomcat_9-jdk11/Dockerfile
copy to tomcat_9-jdk21-openjdk-slim/Dockerfile
index 3bd2969..c372932 100644
--- a/tomcat_9-jdk11/Dockerfile
+++ b/tomcat_9-jdk21-openjdk-slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:11-jdk-jammy
+FROM openjdk:21-jdk-slim-bookworm
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk21-openjdk/Dockerfile
similarity index 99%
copy from tomcat_9-jdk8/Dockerfile
copy to tomcat_9-jdk21-openjdk/Dockerfile
index bf3bb05..5be6f07 100644
--- a/tomcat_9-jdk8/Dockerfile
+++ b/tomcat_9-jdk21-openjdk/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:8-jdk-jammy
+FROM openjdk:21-jdk-bookworm
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_latest/Dockerfile b/tomcat_jdk21-openjdk-slim/Dockerfile
similarity index 99%
copy from tomcat_latest/Dockerfile
copy to tomcat_jdk21-openjdk-slim/Dockerfile
index d1e75ec..66649b9 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_jdk21-openjdk-slim/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:17-jdk-jammy
+FROM openjdk:21-jdk-slim-bookworm
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
diff --git a/tomcat_latest/Dockerfile b/tomcat_jdk21-openjdk/Dockerfile
similarity index 99%
copy from tomcat_latest/Dockerfile
copy to tomcat_jdk21-openjdk/Dockerfile
index d1e75ec..8cf23e7 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_jdk21-openjdk/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM eclipse-temurin:17-jdk-jammy
+FROM openjdk:21-jdk-bookworm
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATHRelevant Maintainers: |
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: