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 #17128

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Update tomcat #17128

merged 1 commit into from
Jul 5, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 5, 2024

Changes:

Changes:

- docker-library/tomcat@f310ad6: Update 11.0 to 11.0.0-M22
@tianon tianon requested a review from a team as a code owner July 5, 2024 21:54
Copy link

github-actions bot commented Jul 5, 2024

Diff for cc95800:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7055fb5..7568f52 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -121,12 +121,12 @@ Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: 3f32851578fdc88622b6dd24c83fef4195249c2d
 Directory: 10.1/jre21/temurin-jammy
 
-Tags: 11.0.0-M21-jdk21-temurin-jammy, 11.0.0-jdk21-temurin-jammy, 11.0-jdk21-temurin-jammy, 11.0.0-M21-jdk21-temurin, 11.0.0-jdk21-temurin, 11.0-jdk21-temurin, 11.0.0-M21-jdk21, 11.0.0-jdk21, 11.0-jdk21, 11.0.0-M21, 11.0.0, 11.0
+Tags: 11.0.0-M22-jdk21-temurin-jammy, 11.0.0-jdk21-temurin-jammy, 11.0-jdk21-temurin-jammy, 11.0.0-M22-jdk21-temurin, 11.0.0-jdk21-temurin, 11.0-jdk21-temurin, 11.0.0-M22-jdk21, 11.0.0-jdk21, 11.0-jdk21, 11.0.0-M22, 11.0.0, 11.0
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 8e7b733a76bf1e79c0a58d2a64ed7e29f5caf17e
+GitCommit: f310ad695a638b361001f95f7a35f0cc43db6e35
 Directory: 11.0/jdk21/temurin-jammy
 
-Tags: 11.0.0-M21-jre21-temurin-jammy, 11.0.0-jre21-temurin-jammy, 11.0-jre21-temurin-jammy, 11.0.0-M21-jre21-temurin, 11.0.0-jre21-temurin, 11.0-jre21-temurin, 11.0.0-M21-jre21, 11.0.0-jre21, 11.0-jre21
+Tags: 11.0.0-M22-jre21-temurin-jammy, 11.0.0-jre21-temurin-jammy, 11.0-jre21-temurin-jammy, 11.0.0-M22-jre21-temurin, 11.0.0-jre21-temurin, 11.0-jre21-temurin, 11.0.0-M22-jre21, 11.0.0-jre21, 11.0-jre21
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 8e7b733a76bf1e79c0a58d2a64ed7e29f5caf17e
+GitCommit: f310ad695a638b361001f95f7a35f0cc43db6e35
 Directory: 11.0/jre21/temurin-jammy
diff --git a/_bashbrew-list b/_bashbrew-list
index d633409..9a01e82 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -180,13 +180,13 @@ tomcat:11.0-jre21
 tomcat:11.0-jre21-temurin
 tomcat:11.0-jre21-temurin-jammy
 tomcat:11.0.0
-tomcat:11.0.0-M21
-tomcat:11.0.0-M21-jdk21
-tomcat:11.0.0-M21-jdk21-temurin
-tomcat:11.0.0-M21-jdk21-temurin-jammy
-tomcat:11.0.0-M21-jre21
-tomcat:11.0.0-M21-jre21-temurin
-tomcat:11.0.0-M21-jre21-temurin-jammy
+tomcat:11.0.0-M22
+tomcat:11.0.0-M22-jdk21
+tomcat:11.0.0-M22-jdk21-temurin
+tomcat:11.0.0-M22-jdk21-temurin-jammy
+tomcat:11.0.0-M22-jre21
+tomcat:11.0.0-M22-jre21-temurin
+tomcat:11.0.0-M22-jre21-temurin-jammy
 tomcat:11.0.0-jdk21
 tomcat:11.0.0-jdk21-temurin
 tomcat:11.0.0-jdk21-temurin-jammy
diff --git a/tomcat_11.0-jre21/Dockerfile b/tomcat_11.0-jre21/Dockerfile
index 0c1583d..16fa35b 100644
--- a/tomcat_11.0-jre21/Dockerfile
+++ b/tomcat_11.0-jre21/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 11
-ENV TOMCAT_VERSION 11.0.0-M21
-ENV TOMCAT_SHA512 034444deb0c238847b2161c5b05648ca7d1a7a79bf4848a59aeb40b87a1c28eb848b1a659db8684914bf79db706d73b69f42ce59c379ba6cde3e466a533abb0e
+ENV TOMCAT_VERSION 11.0.0-M22
+ENV TOMCAT_SHA512 a6d41340304a8e2b48677b6043badcc28cf336b995107b6b08b71a8a9fe9da07628e6cef4ca60795d15d3c0744833fc96707e6ecf696942443cadab92301735f
 
-COPY --from=tomcat:11.0.0-M21-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:11.0.0-M22-jdk21-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_11.0/Dockerfile b/tomcat_11.0/Dockerfile
index 0169759..ea54416 100644
--- a/tomcat_11.0/Dockerfile
+++ b/tomcat_11.0/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 48F8E69F6390C9F25CFEDCD268248959359E722B A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 11
-ENV TOMCAT_VERSION 11.0.0-M21
-ENV TOMCAT_SHA512 034444deb0c238847b2161c5b05648ca7d1a7a79bf4848a59aeb40b87a1c28eb848b1a659db8684914bf79db706d73b69f42ce59c379ba6cde3e466a533abb0e
+ENV TOMCAT_VERSION 11.0.0-M22
+ENV TOMCAT_SHA512 a6d41340304a8e2b48677b6043badcc28cf336b995107b6b08b71a8a9fe9da07628e6cef4ca60795d15d3c0744833fc96707e6ecf696942443cadab92301735f
 
 RUN set -eux; \
 	\

Relevant Maintainers:

@tianon tianon merged commit 69c2d7e into docker-library:master Jul 5, 2024
20 checks passed
@tianon tianon deleted the tomcat branch July 5, 2024 23:50
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.

2 participants