Update tomcat #17532
Merged
Update tomcat #17532
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@9209057: Update 11.0 to 11.0.0-M25
Diff for 1faac58:diff --git a/_bashbrew-cat b/_bashbrew-cat
index d316e3a..40dfe69 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -161,22 +161,22 @@ Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
GitCommit: 09c610865f48e48d4874e1bf9aa88502b102d40d
Directory: 10.1/jre21/temurin-noble
-Tags: 11.0.0-M24-jdk21-temurin-jammy, 11.0.0-jdk21-temurin-jammy, 11.0-jdk21-temurin-jammy
+Tags: 11.0.0-M25-jdk21-temurin-jammy, 11.0.0-jdk21-temurin-jammy, 11.0-jdk21-temurin-jammy
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d9e0dd9720388bdc74509b752483fbe471dd5a21
+GitCommit: 9209057a06b467179d1cdb1e2825bcc5304eee9f
Directory: 11.0/jdk21/temurin-jammy
-Tags: 11.0.0-M24-jdk21-temurin-noble, 11.0.0-jdk21-temurin-noble, 11.0-jdk21-temurin-noble, 11.0.0-M24-jdk21-temurin, 11.0.0-jdk21-temurin, 11.0-jdk21-temurin, 11.0.0-M24-jdk21, 11.0.0-jdk21, 11.0-jdk21, 11.0.0-M24, 11.0.0, 11.0
+Tags: 11.0.0-M25-jdk21-temurin-noble, 11.0.0-jdk21-temurin-noble, 11.0-jdk21-temurin-noble, 11.0.0-M25-jdk21-temurin, 11.0.0-jdk21-temurin, 11.0-jdk21-temurin, 11.0.0-M25-jdk21, 11.0.0-jdk21, 11.0-jdk21, 11.0.0-M25, 11.0.0, 11.0
Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
-GitCommit: d9e0dd9720388bdc74509b752483fbe471dd5a21
+GitCommit: 9209057a06b467179d1cdb1e2825bcc5304eee9f
Directory: 11.0/jdk21/temurin-noble
-Tags: 11.0.0-M24-jre21-temurin-jammy, 11.0.0-jre21-temurin-jammy, 11.0-jre21-temurin-jammy
+Tags: 11.0.0-M25-jre21-temurin-jammy, 11.0.0-jre21-temurin-jammy, 11.0-jre21-temurin-jammy
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: d9e0dd9720388bdc74509b752483fbe471dd5a21
+GitCommit: 9209057a06b467179d1cdb1e2825bcc5304eee9f
Directory: 11.0/jre21/temurin-jammy
-Tags: 11.0.0-M24-jre21-temurin-noble, 11.0.0-jre21-temurin-noble, 11.0-jre21-temurin-noble, 11.0.0-M24-jre21-temurin, 11.0.0-jre21-temurin, 11.0-jre21-temurin, 11.0.0-M24-jre21, 11.0.0-jre21, 11.0-jre21
+Tags: 11.0.0-M25-jre21-temurin-noble, 11.0.0-jre21-temurin-noble, 11.0-jre21-temurin-noble, 11.0.0-M25-jre21-temurin, 11.0.0-jre21-temurin, 11.0-jre21-temurin, 11.0.0-M25-jre21, 11.0.0-jre21, 11.0-jre21
Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
-GitCommit: d9e0dd9720388bdc74509b752483fbe471dd5a21
+GitCommit: 9209057a06b467179d1cdb1e2825bcc5304eee9f
Directory: 11.0/jre21/temurin-noble
diff --git a/_bashbrew-list b/_bashbrew-list
index 784d2d9..0735625 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -206,15 +206,15 @@ tomcat:11.0-jre21-temurin
tomcat:11.0-jre21-temurin-jammy
tomcat:11.0-jre21-temurin-noble
tomcat:11.0.0
-tomcat:11.0.0-M24
-tomcat:11.0.0-M24-jdk21
-tomcat:11.0.0-M24-jdk21-temurin
-tomcat:11.0.0-M24-jdk21-temurin-jammy
-tomcat:11.0.0-M24-jdk21-temurin-noble
-tomcat:11.0.0-M24-jre21
-tomcat:11.0.0-M24-jre21-temurin
-tomcat:11.0.0-M24-jre21-temurin-jammy
-tomcat:11.0.0-M24-jre21-temurin-noble
+tomcat:11.0.0-M25
+tomcat:11.0.0-M25-jdk21
+tomcat:11.0.0-M25-jdk21-temurin
+tomcat:11.0.0-M25-jdk21-temurin-jammy
+tomcat:11.0.0-M25-jdk21-temurin-noble
+tomcat:11.0.0-M25-jre21
+tomcat:11.0.0-M25-jre21-temurin
+tomcat:11.0.0-M25-jre21-temurin-jammy
+tomcat:11.0.0-M25-jre21-temurin-noble
tomcat:11.0.0-jdk21
tomcat:11.0.0-jdk21-temurin
tomcat:11.0.0-jdk21-temurin-jammy
diff --git a/tomcat_11.0-jdk21-temurin-jammy/Dockerfile b/tomcat_11.0-jdk21-temurin-jammy/Dockerfile
index acb5aac..eb83c49 100644
--- a/tomcat_11.0-jdk21-temurin-jammy/Dockerfile
+++ b/tomcat_11.0-jdk21-temurin-jammy/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-M24
-ENV TOMCAT_SHA512 838d17c6ab2cdb0cb7ddeb639c4a76cefa08a3282bac85503a65a6d0e88da1baea3eb8f16ca1e91e44191f393af71745a79c30931692559524f6a031208e1647
+ENV TOMCAT_VERSION 11.0.0-M25
+ENV TOMCAT_SHA512 9b7c72afc8dd79d3433c7793dd03db95ffcecd4ca251a9b527309eb8922e8e4ed52c4de340403030b3b12627674c5a9a97ba2f29bc4aa5a5485e698772261e74
RUN set -eux; \
\
diff --git a/tomcat_11.0-jre21-temurin-jammy/Dockerfile b/tomcat_11.0-jre21-temurin-jammy/Dockerfile
index 4104ed1..6e36965 100644
--- a/tomcat_11.0-jre21-temurin-jammy/Dockerfile
+++ b/tomcat_11.0-jre21-temurin-jammy/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-M24
-ENV TOMCAT_SHA512 838d17c6ab2cdb0cb7ddeb639c4a76cefa08a3282bac85503a65a6d0e88da1baea3eb8f16ca1e91e44191f393af71745a79c30931692559524f6a031208e1647
+ENV TOMCAT_VERSION 11.0.0-M25
+ENV TOMCAT_SHA512 9b7c72afc8dd79d3433c7793dd03db95ffcecd4ca251a9b527309eb8922e8e4ed52c4de340403030b3b12627674c5a9a97ba2f29bc4aa5a5485e698772261e74
-COPY --from=tomcat:11.0.0-M24-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:11.0.0-M25-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-jre21/Dockerfile b/tomcat_11.0-jre21/Dockerfile
index edd5aff..571088c 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-M24
-ENV TOMCAT_SHA512 838d17c6ab2cdb0cb7ddeb639c4a76cefa08a3282bac85503a65a6d0e88da1baea3eb8f16ca1e91e44191f393af71745a79c30931692559524f6a031208e1647
+ENV TOMCAT_VERSION 11.0.0-M25
+ENV TOMCAT_SHA512 9b7c72afc8dd79d3433c7793dd03db95ffcecd4ca251a9b527309eb8922e8e4ed52c4de340403030b3b12627674c5a9a97ba2f29bc4aa5a5485e698772261e74
-COPY --from=tomcat:11.0.0-M24-jdk21-temurin-noble $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:11.0.0-M25-jdk21-temurin-noble $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 db98421..b2398da 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-M24
-ENV TOMCAT_SHA512 838d17c6ab2cdb0cb7ddeb639c4a76cefa08a3282bac85503a65a6d0e88da1baea3eb8f16ca1e91e44191f393af71745a79c30931692559524f6a031208e1647
+ENV TOMCAT_VERSION 11.0.0-M25
+ENV TOMCAT_SHA512 9b7c72afc8dd79d3433c7793dd03db95ffcecd4ca251a9b527309eb8922e8e4ed52c4de340403030b3b12627674c5a9a97ba2f29bc4aa5a5485e698772261e74
RUN set -eux; \
\Relevant Maintainers: |
yosifkit
approved these changes
Sep 10, 2024
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: