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.

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 tomcat #13658

Merged
merged 1 commit into from
Dec 5, 2022
Merged

Update tomcat #13658

merged 1 commit into from
Dec 5, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 5, 2022

Changes:

Changes:

- docker-library/tomcat@a224ecf: Merge pull request docker-library/tomcat#284 from infosiftr/tomcat-11
- docker-library/tomcat@f413ee3: Add 11.0.0-M1
- docker-library/tomcat@96bffb8: Update 9.0 to 9.0.70
@github-actions
Copy link

github-actions bot commented Dec 5, 2022

Diff for b6e130a:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9488274..6854000 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -76,79 +76,79 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 9cad4b1a880782d3504d7c8723fccc667965cf29
 Directory: 8.5/jre17/temurin-jammy
 
-Tags: 9.0.69-jdk8-corretto-al2, 9.0-jdk8-corretto-al2, 9-jdk8-corretto-al2, 9.0.69-jdk8-corretto, 9.0-jdk8-corretto, 9-jdk8-corretto
+Tags: 9.0.70-jdk8-corretto-al2, 9.0-jdk8-corretto-al2, 9-jdk8-corretto-al2, 9.0.70-jdk8-corretto, 9.0-jdk8-corretto, 9-jdk8-corretto
 Architectures: amd64, arm64v8
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk8/corretto-al2
 
-Tags: 9.0.69-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal
+Tags: 9.0.70-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk8/temurin-focal
 
-Tags: 9.0.69-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy, 9.0.69-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.69-jdk8, 9.0-jdk8, 9-jdk8
+Tags: 9.0.70-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy, 9.0.70-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.70-jdk8, 9.0-jdk8, 9-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk8/temurin-jammy
 
-Tags: 9.0.69-jdk11-corretto-al2, 9.0-jdk11-corretto-al2, 9-jdk11-corretto-al2, 9.0.69-jdk11-corretto, 9.0-jdk11-corretto, 9-jdk11-corretto
+Tags: 9.0.70-jdk11-corretto-al2, 9.0-jdk11-corretto-al2, 9-jdk11-corretto-al2, 9.0.70-jdk11-corretto, 9.0-jdk11-corretto, 9-jdk11-corretto
 Architectures: amd64, arm64v8
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk11/corretto-al2
 
-Tags: 9.0.69-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal
+Tags: 9.0.70-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk11/temurin-focal
 
-Tags: 9.0.69-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy, 9.0.69-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.69-jdk11, 9.0-jdk11, 9-jdk11
+Tags: 9.0.70-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy, 9.0.70-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.70-jdk11, 9.0-jdk11, 9-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk11/temurin-jammy
 
-Tags: 9.0.69-jdk17-corretto-al2, 9.0-jdk17-corretto-al2, 9-jdk17-corretto-al2, 9.0.69-jdk17-corretto, 9.0-jdk17-corretto, 9-jdk17-corretto
+Tags: 9.0.70-jdk17-corretto-al2, 9.0-jdk17-corretto-al2, 9-jdk17-corretto-al2, 9.0.70-jdk17-corretto, 9.0-jdk17-corretto, 9-jdk17-corretto
 Architectures: amd64, arm64v8
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk17/corretto-al2
 
-Tags: 9.0.69-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal
+Tags: 9.0.70-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk17/temurin-focal
 
-Tags: 9.0.69-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy, 9.0.69-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.69-jdk17, 9.0-jdk17, 9-jdk17, 9.0.69, 9.0, 9
+Tags: 9.0.70-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy, 9.0.70-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.70-jdk17, 9.0-jdk17, 9-jdk17, 9.0.70, 9.0, 9
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jdk17/temurin-jammy
 
-Tags: 9.0.69-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
+Tags: 9.0.70-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jre8/temurin-focal
 
-Tags: 9.0.69-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy, 9.0.69-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.69-jre8, 9.0-jre8, 9-jre8
+Tags: 9.0.70-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy, 9.0.70-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.70-jre8, 9.0-jre8, 9-jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jre8/temurin-jammy
 
-Tags: 9.0.69-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal
+Tags: 9.0.70-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jre11/temurin-focal
 
-Tags: 9.0.69-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy, 9.0.69-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.69-jre11, 9.0-jre11, 9-jre11
+Tags: 9.0.70-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy, 9.0.70-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.70-jre11, 9.0-jre11, 9-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jre11/temurin-jammy
 
-Tags: 9.0.69-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal
+Tags: 9.0.70-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jre17/temurin-focal
 
-Tags: 9.0.69-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy, 9.0.69-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.69-jre17, 9.0-jre17, 9-jre17
+Tags: 9.0.70-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy, 9.0.70-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.70-jre17, 9.0-jre17, 9-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 33f29375055a9bcb35b3d906a435eefa9c7d671e
+GitCommit: 96bffb8ff7c41de2928096518962c468dbc9f013
 Directory: 9.0/jre17/temurin-jammy
 
 Tags: 10.0.27-jdk8-corretto-al2, 10.0-jdk8-corretto-al2, 10.0.27-jdk8-corretto, 10.0-jdk8-corretto
@@ -245,3 +245,23 @@ Tags: 10.1.2-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jam
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: f5728d643f53670ab3d10ac98b74be076190be3a
 Directory: 10.1/jre17/temurin-jammy
+
+Tags: 11.0.0-M1-jdk11-temurin-jammy, 11.0.0-jdk11-temurin-jammy, 11.0-jdk11-temurin-jammy, 11.0.0-M1-jdk11-temurin, 11.0.0-jdk11-temurin, 11.0-jdk11-temurin, 11.0.0-M1-jdk11, 11.0.0-jdk11, 11.0-jdk11
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: f413ee3c1b5be50b58db8cd1e9caff62a040b868
+Directory: 11.0/jdk11/temurin-jammy
+
+Tags: 11.0.0-M1-jdk17-temurin-jammy, 11.0.0-jdk17-temurin-jammy, 11.0-jdk17-temurin-jammy, 11.0.0-M1-jdk17-temurin, 11.0.0-jdk17-temurin, 11.0-jdk17-temurin, 11.0.0-M1-jdk17, 11.0.0-jdk17, 11.0-jdk17, 11.0.0-M1, 11.0.0, 11.0
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: f413ee3c1b5be50b58db8cd1e9caff62a040b868
+Directory: 11.0/jdk17/temurin-jammy
+
+Tags: 11.0.0-M1-jre11-temurin-jammy, 11.0.0-jre11-temurin-jammy, 11.0-jre11-temurin-jammy, 11.0.0-M1-jre11-temurin, 11.0.0-jre11-temurin, 11.0-jre11-temurin, 11.0.0-M1-jre11, 11.0.0-jre11, 11.0-jre11
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: f413ee3c1b5be50b58db8cd1e9caff62a040b868
+Directory: 11.0/jre11/temurin-jammy
+
+Tags: 11.0.0-M1-jre17-temurin-jammy, 11.0.0-jre17-temurin-jammy, 11.0-jre17-temurin-jammy, 11.0.0-M1-jre17-temurin, 11.0.0-jre17-temurin, 11.0-jre17-temurin, 11.0.0-M1-jre17, 11.0.0-jre17, 11.0-jre17
+Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
+GitCommit: f413ee3c1b5be50b58db8cd1e9caff62a040b868
+Directory: 11.0/jre17/temurin-jammy
diff --git a/_bashbrew-list b/_bashbrew-list
index 1250fd3..daf7048 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -153,37 +153,37 @@ tomcat:9.0-jre17
 tomcat:9.0-jre17-temurin
 tomcat:9.0-jre17-temurin-focal
 tomcat:9.0-jre17-temurin-jammy
-tomcat:9.0.69
-tomcat:9.0.69-jdk8
-tomcat:9.0.69-jdk8-corretto
-tomcat:9.0.69-jdk8-corretto-al2
-tomcat:9.0.69-jdk8-temurin
-tomcat:9.0.69-jdk8-temurin-focal
-tomcat:9.0.69-jdk8-temurin-jammy
-tomcat:9.0.69-jdk11
-tomcat:9.0.69-jdk11-corretto
-tomcat:9.0.69-jdk11-corretto-al2
-tomcat:9.0.69-jdk11-temurin
-tomcat:9.0.69-jdk11-temurin-focal
-tomcat:9.0.69-jdk11-temurin-jammy
-tomcat:9.0.69-jdk17
-tomcat:9.0.69-jdk17-corretto
-tomcat:9.0.69-jdk17-corretto-al2
-tomcat:9.0.69-jdk17-temurin
-tomcat:9.0.69-jdk17-temurin-focal
-tomcat:9.0.69-jdk17-temurin-jammy
-tomcat:9.0.69-jre8
-tomcat:9.0.69-jre8-temurin
-tomcat:9.0.69-jre8-temurin-focal
-tomcat:9.0.69-jre8-temurin-jammy
-tomcat:9.0.69-jre11
-tomcat:9.0.69-jre11-temurin
-tomcat:9.0.69-jre11-temurin-focal
-tomcat:9.0.69-jre11-temurin-jammy
-tomcat:9.0.69-jre17
-tomcat:9.0.69-jre17-temurin
-tomcat:9.0.69-jre17-temurin-focal
-tomcat:9.0.69-jre17-temurin-jammy
+tomcat:9.0.70
+tomcat:9.0.70-jdk8
+tomcat:9.0.70-jdk8-corretto
+tomcat:9.0.70-jdk8-corretto-al2
+tomcat:9.0.70-jdk8-temurin
+tomcat:9.0.70-jdk8-temurin-focal
+tomcat:9.0.70-jdk8-temurin-jammy
+tomcat:9.0.70-jdk11
+tomcat:9.0.70-jdk11-corretto
+tomcat:9.0.70-jdk11-corretto-al2
+tomcat:9.0.70-jdk11-temurin
+tomcat:9.0.70-jdk11-temurin-focal
+tomcat:9.0.70-jdk11-temurin-jammy
+tomcat:9.0.70-jdk17
+tomcat:9.0.70-jdk17-corretto
+tomcat:9.0.70-jdk17-corretto-al2
+tomcat:9.0.70-jdk17-temurin
+tomcat:9.0.70-jdk17-temurin-focal
+tomcat:9.0.70-jdk17-temurin-jammy
+tomcat:9.0.70-jre8
+tomcat:9.0.70-jre8-temurin
+tomcat:9.0.70-jre8-temurin-focal
+tomcat:9.0.70-jre8-temurin-jammy
+tomcat:9.0.70-jre11
+tomcat:9.0.70-jre11-temurin
+tomcat:9.0.70-jre11-temurin-focal
+tomcat:9.0.70-jre11-temurin-jammy
+tomcat:9.0.70-jre17
+tomcat:9.0.70-jre17-temurin
+tomcat:9.0.70-jre17-temurin-focal
+tomcat:9.0.70-jre17-temurin-jammy
 tomcat:10
 tomcat:10-jdk11
 tomcat:10-jdk11-temurin
@@ -285,6 +285,45 @@ tomcat:10.1.2-jre11-temurin-jammy
 tomcat:10.1.2-jre17
 tomcat:10.1.2-jre17-temurin
 tomcat:10.1.2-jre17-temurin-jammy
+tomcat:11.0
+tomcat:11.0-jdk11
+tomcat:11.0-jdk11-temurin
+tomcat:11.0-jdk11-temurin-jammy
+tomcat:11.0-jdk17
+tomcat:11.0-jdk17-temurin
+tomcat:11.0-jdk17-temurin-jammy
+tomcat:11.0-jre11
+tomcat:11.0-jre11-temurin
+tomcat:11.0-jre11-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-M1
+tomcat:11.0.0-M1-jdk11
+tomcat:11.0.0-M1-jdk11-temurin
+tomcat:11.0.0-M1-jdk11-temurin-jammy
+tomcat:11.0.0-M1-jdk17
+tomcat:11.0.0-M1-jdk17-temurin
+tomcat:11.0.0-M1-jdk17-temurin-jammy
+tomcat:11.0.0-M1-jre11
+tomcat:11.0.0-M1-jre11-temurin
+tomcat:11.0.0-M1-jre11-temurin-jammy
+tomcat:11.0.0-M1-jre17
+tomcat:11.0.0-M1-jre17-temurin
+tomcat:11.0.0-M1-jre17-temurin-jammy
+tomcat:11.0.0-jdk11
+tomcat:11.0.0-jdk11-temurin
+tomcat:11.0.0-jdk11-temurin-jammy
+tomcat:11.0.0-jdk17
+tomcat:11.0.0-jdk17-temurin
+tomcat:11.0.0-jdk17-temurin-jammy
+tomcat:11.0.0-jre11
+tomcat:11.0.0-jre11-temurin
+tomcat:11.0.0-jre11-temurin-jammy
+tomcat:11.0.0-jre17
+tomcat:11.0.0-jre17-temurin
+tomcat:11.0.0-jre17-temurin-jammy
 tomcat:jdk11
 tomcat:jdk11-temurin
 tomcat:jdk11-temurin-jammy
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_11.0-jdk11/Dockerfile
similarity index 95%
copy from tomcat_jdk11/Dockerfile
copy to tomcat_11.0-jdk11/Dockerfile
index 413d7c1..c35506f 100644
--- a/tomcat_jdk11/Dockerfile
+++ b/tomcat_11.0-jdk11/Dockerfile
@@ -15,13 +15,13 @@ WORKDIR $CATALINA_HOME
 ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
 ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 
-# see https://www.apache.org/dist/tomcat/tomcat-10/KEYS
+# see https://www.apache.org/dist/tomcat/tomcat-11/KEYS
 # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh)
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
-ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.2
-ENV TOMCAT_SHA512 50e933934cbf2915603264dfd245db0137491555d71d4fe8a535a7a8b6bc36bb4984e8bb2f38c968fbfc84a87aeeaa773ce1c6ee5f2eaa87780d1869251da51e
+ENV TOMCAT_MAJOR 11
+ENV TOMCAT_VERSION 11.0.0-M1
+ENV TOMCAT_SHA512 c2d02f2ac1b11122293af7d5ef3cf4dbc1932f19806ba89ea0cd36efcca7701304eef2f3cc03a496fd3a107080a582d3ca3faee207f0bce8b98c266f0a73edc7
 
 RUN set -eux; \
 	\
diff --git a/tomcat_jre11/Dockerfile b/tomcat_11.0-jre11/Dockerfile
similarity index 78%
copy from tomcat_jre11/Dockerfile
copy to tomcat_11.0-jre11/Dockerfile
index e8d11be..e7ef34e 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_11.0-jre11/Dockerfile
@@ -15,15 +15,15 @@ WORKDIR $CATALINA_HOME
 ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
 ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 
-# see https://www.apache.org/dist/tomcat/tomcat-10/KEYS
+# see https://www.apache.org/dist/tomcat/tomcat-11/KEYS
 # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh)
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
-ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.2
-ENV TOMCAT_SHA512 50e933934cbf2915603264dfd245db0137491555d71d4fe8a535a7a8b6bc36bb4984e8bb2f38c968fbfc84a87aeeaa773ce1c6ee5f2eaa87780d1869251da51e
+ENV TOMCAT_MAJOR 11
+ENV TOMCAT_VERSION 11.0.0-M1
+ENV TOMCAT_SHA512 c2d02f2ac1b11122293af7d5ef3cf4dbc1932f19806ba89ea0cd36efcca7701304eef2f3cc03a496fd3a107080a582d3ca3faee207f0bce8b98c266f0a73edc7
 
-COPY --from=tomcat:10.1.2-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:11.0.0-M1-jdk11-temurin-jammy $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/Dockerfile b/tomcat_11.0-jre17/Dockerfile
similarity index 78%
copy from tomcat_jre17/Dockerfile
copy to tomcat_11.0-jre17/Dockerfile
index 15596e0..3dd685f 100644
--- a/tomcat_jre17/Dockerfile
+++ b/tomcat_11.0-jre17/Dockerfile
@@ -15,15 +15,15 @@ WORKDIR $CATALINA_HOME
 ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
 ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 
-# see https://www.apache.org/dist/tomcat/tomcat-10/KEYS
+# see https://www.apache.org/dist/tomcat/tomcat-11/KEYS
 # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh)
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
-ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.2
-ENV TOMCAT_SHA512 50e933934cbf2915603264dfd245db0137491555d71d4fe8a535a7a8b6bc36bb4984e8bb2f38c968fbfc84a87aeeaa773ce1c6ee5f2eaa87780d1869251da51e
+ENV TOMCAT_MAJOR 11
+ENV TOMCAT_VERSION 11.0.0-M1
+ENV TOMCAT_SHA512 c2d02f2ac1b11122293af7d5ef3cf4dbc1932f19806ba89ea0cd36efcca7701304eef2f3cc03a496fd3a107080a582d3ca3faee207f0bce8b98c266f0a73edc7
 
-COPY --from=tomcat:10.1.2-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:11.0.0-M1-jdk17-temurin-jammy $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_11.0/Dockerfile
similarity index 95%
copy from tomcat_latest/Dockerfile
copy to tomcat_11.0/Dockerfile
index 256a787..29cf807 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_11.0/Dockerfile
@@ -15,13 +15,13 @@ WORKDIR $CATALINA_HOME
 ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
 ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 
-# see https://www.apache.org/dist/tomcat/tomcat-10/KEYS
+# see https://www.apache.org/dist/tomcat/tomcat-11/KEYS
 # see also "versions.sh" (https://github.com/docker-library/tomcat/blob/master/versions.sh)
 ENV GPG_KEYS A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
-ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.2
-ENV TOMCAT_SHA512 50e933934cbf2915603264dfd245db0137491555d71d4fe8a535a7a8b6bc36bb4984e8bb2f38c968fbfc84a87aeeaa773ce1c6ee5f2eaa87780d1869251da51e
+ENV TOMCAT_MAJOR 11
+ENV TOMCAT_VERSION 11.0.0-M1
+ENV TOMCAT_SHA512 c2d02f2ac1b11122293af7d5ef3cf4dbc1932f19806ba89ea0cd36efcca7701304eef2f3cc03a496fd3a107080a582d3ca3faee207f0bce8b98c266f0a73edc7
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk11-corretto/Dockerfile b/tomcat_9-jdk11-corretto/Dockerfile
index 36afd4e..adc881a 100644
--- a/tomcat_9-jdk11-corretto/Dockerfile
+++ b/tomcat_9-jdk11-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk11-temurin-focal/Dockerfile b/tomcat_9-jdk11-temurin-focal/Dockerfile
index 4291470..df88b91 100644
--- a/tomcat_9-jdk11-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk11-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk11/Dockerfile b/tomcat_9-jdk11/Dockerfile
index 8d27576..f0b9702 100644
--- a/tomcat_9-jdk11/Dockerfile
+++ b/tomcat_9-jdk11/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk17-corretto/Dockerfile b/tomcat_9-jdk17-corretto/Dockerfile
index 4e1fcc9..3182d37 100644
--- a/tomcat_9-jdk17-corretto/Dockerfile
+++ b/tomcat_9-jdk17-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk17-temurin-focal/Dockerfile b/tomcat_9-jdk17-temurin-focal/Dockerfile
index 2642069..aac43ec 100644
--- a/tomcat_9-jdk17-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk17-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk8-corretto/Dockerfile b/tomcat_9-jdk8-corretto/Dockerfile
index b3e3b01..b196dc5 100644
--- a/tomcat_9-jdk8-corretto/Dockerfile
+++ b/tomcat_9-jdk8-corretto/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk8-temurin-focal/Dockerfile b/tomcat_9-jdk8-temurin-focal/Dockerfile
index 1ddf26b..9b2db6b 100644
--- a/tomcat_9-jdk8-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk8-temurin-focal/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk8/Dockerfile
index 2448880..8e9c6bd 100644
--- a/tomcat_9-jdk8/Dockerfile
+++ b/tomcat_9-jdk8/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\
diff --git a/tomcat_9-jre11-temurin-focal/Dockerfile b/tomcat_9-jre11-temurin-focal/Dockerfile
index 9b739be..292e735 100644
--- a/tomcat_9-jre11-temurin-focal/Dockerfile
+++ b/tomcat_9-jre11-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
-COPY --from=tomcat:9.0.69-jdk11-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.70-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-jre11/Dockerfile b/tomcat_9-jre11/Dockerfile
index 7cdd909..5f4d7e6 100644
--- a/tomcat_9-jre11/Dockerfile
+++ b/tomcat_9-jre11/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
-COPY --from=tomcat:9.0.69-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.70-jdk11-temurin-jammy $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-focal/Dockerfile b/tomcat_9-jre17-temurin-focal/Dockerfile
index 6b24941..d7e0280 100644
--- a/tomcat_9-jre17-temurin-focal/Dockerfile
+++ b/tomcat_9-jre17-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
-COPY --from=tomcat:9.0.69-jdk17-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.70-jdk17-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/Dockerfile b/tomcat_9-jre17/Dockerfile
index 3f83d6e..34df79f 100644
--- a/tomcat_9-jre17/Dockerfile
+++ b/tomcat_9-jre17/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
-COPY --from=tomcat:9.0.69-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.70-jdk17-temurin-jammy $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-jre8-temurin-focal/Dockerfile b/tomcat_9-jre8-temurin-focal/Dockerfile
index dc88d63..0183f39 100644
--- a/tomcat_9-jre8-temurin-focal/Dockerfile
+++ b/tomcat_9-jre8-temurin-focal/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
-COPY --from=tomcat:9.0.69-jdk8-temurin-focal $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.70-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-jre8/Dockerfile b/tomcat_9-jre8/Dockerfile
index 708bf3b..8a4707f 100644
--- a/tomcat_9-jre8/Dockerfile
+++ b/tomcat_9-jre8/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
-COPY --from=tomcat:9.0.69-jdk8-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:9.0.70-jdk8-temurin-jammy $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 5a93fb5..0100067 100644
--- a/tomcat_9/Dockerfile
+++ b/tomcat_9/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.69
-ENV TOMCAT_SHA512 8c883c54ce9ce43eba37756a6404cdf3477879883a3e6d146dc8a7aa5e0425f487466afe6b6da4a895927cb7cb59177b9379cec18000f2de12785be57408c779
+ENV TOMCAT_VERSION 9.0.70
+ENV TOMCAT_SHA512 9b57b332f4cfb2c4b9250b95924314507ebafec44f732e755be96d35e1a50d98ca3ea11a8c62e0c6fde2541d31a981f5ca792ea9931b2551b81b495932474726
 
 RUN set -eux; \
 	\

Relevant Maintainers:

@yosifkit yosifkit merged commit 8bb64c8 into docker-library:master Dec 5, 2022
@yosifkit yosifkit deleted the tomcat branch December 5, 2022 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants