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

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Update tomcat #17173

merged 1 commit into from
Jul 12, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 12, 2024

Changes:

@docker-library-bot
Update tomcat
a05380f 
Changes:

- docker-library/tomcat@a4b2635: Update 10.1 to 10.1.26
- docker-library/tomcat@7eda768: Update to actions/checkout@v4 🙃
@tianon tianon requested a review from a team as a code owner July 12, 2024 18:09
@github-actions GitHub Actions
Copy link

Diff for a05380f: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e559e65..18fa286 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -91,34 +91,34 @@ Architectures: amd64, arm64v8, ppc64le, s390x
 GitCommit: a280a462a08befda350fb6729b8dd6ebaf9ced85
 Directory: 9.0/jre21/temurin-jammy
 
-Tags: 10.1.25-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.1.25-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.25-jdk11, 10.1-jdk11, 10-jdk11, jdk11
+Tags: 10.1.26-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.1.26-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.26-jdk11, 10.1-jdk11, 10-jdk11, jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3f32851578fdc88622b6dd24c83fef4195249c2d
+GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jdk11/temurin-jammy
 
-Tags: 10.1.25-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.1.25-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.25-jdk17, 10.1-jdk17, 10-jdk17, jdk17
+Tags: 10.1.26-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.1.26-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.26-jdk17, 10.1-jdk17, 10-jdk17, jdk17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3f32851578fdc88622b6dd24c83fef4195249c2d
+GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jdk17/temurin-jammy
 
-Tags: 10.1.25-jdk21-temurin-jammy, 10.1-jdk21-temurin-jammy, 10-jdk21-temurin-jammy, jdk21-temurin-jammy, 10.1.25-jdk21-temurin, 10.1-jdk21-temurin, 10-jdk21-temurin, jdk21-temurin, 10.1.25-jdk21, 10.1-jdk21, 10-jdk21, jdk21, 10.1.25, 10.1, 10, latest
+Tags: 10.1.26-jdk21-temurin-jammy, 10.1-jdk21-temurin-jammy, 10-jdk21-temurin-jammy, jdk21-temurin-jammy, 10.1.26-jdk21-temurin, 10.1-jdk21-temurin, 10-jdk21-temurin, jdk21-temurin, 10.1.26-jdk21, 10.1-jdk21, 10-jdk21, jdk21, 10.1.26, 10.1, 10, latest
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 3f32851578fdc88622b6dd24c83fef4195249c2d
+GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jdk21/temurin-jammy
 
-Tags: 10.1.25-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.25-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.25-jre11, 10.1-jre11, 10-jre11, jre11
+Tags: 10.1.26-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.26-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.26-jre11, 10.1-jre11, 10-jre11, jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3f32851578fdc88622b6dd24c83fef4195249c2d
+GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jre11/temurin-jammy
 
-Tags: 10.1.25-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy, 10.1.25-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.25-jre17, 10.1-jre17, 10-jre17, jre17
+Tags: 10.1.26-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy, 10.1.26-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.26-jre17, 10.1-jre17, 10-jre17, jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3f32851578fdc88622b6dd24c83fef4195249c2d
+GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jre17/temurin-jammy
 
-Tags: 10.1.25-jre21-temurin-jammy, 10.1-jre21-temurin-jammy, 10-jre21-temurin-jammy, jre21-temurin-jammy, 10.1.25-jre21-temurin, 10.1-jre21-temurin, 10-jre21-temurin, jre21-temurin, 10.1.25-jre21, 10.1-jre21, 10-jre21, jre21
+Tags: 10.1.26-jre21-temurin-jammy, 10.1-jre21-temurin-jammy, 10-jre21-temurin-jammy, jre21-temurin-jammy, 10.1.26-jre21-temurin, 10.1-jre21-temurin, 10-jre21-temurin, jre21-temurin, 10.1.26-jre21, 10.1-jre21, 10-jre21, jre21
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 3f32851578fdc88622b6dd24c83fef4195249c2d
+GitCommit: a4b26353acf854ee3f0a656eec8297c9ffc632a0
 Directory: 10.1/jre21/temurin-jammy
 
 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
diff --git a/_bashbrew-list b/_bashbrew-list
index ca98899..6c21aaa 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -153,25 +153,25 @@ tomcat:10.1-jre17-temurin-jammy
 tomcat:10.1-jre21
 tomcat:10.1-jre21-temurin
 tomcat:10.1-jre21-temurin-jammy
-tomcat:10.1.25
-tomcat:10.1.25-jdk11
-tomcat:10.1.25-jdk11-temurin
-tomcat:10.1.25-jdk11-temurin-jammy
-tomcat:10.1.25-jdk17
-tomcat:10.1.25-jdk17-temurin
-tomcat:10.1.25-jdk17-temurin-jammy
-tomcat:10.1.25-jdk21
-tomcat:10.1.25-jdk21-temurin
-tomcat:10.1.25-jdk21-temurin-jammy
-tomcat:10.1.25-jre11
-tomcat:10.1.25-jre11-temurin
-tomcat:10.1.25-jre11-temurin-jammy
-tomcat:10.1.25-jre17
-tomcat:10.1.25-jre17-temurin
-tomcat:10.1.25-jre17-temurin-jammy
-tomcat:10.1.25-jre21
-tomcat:10.1.25-jre21-temurin
-tomcat:10.1.25-jre21-temurin-jammy
+tomcat:10.1.26
+tomcat:10.1.26-jdk11
+tomcat:10.1.26-jdk11-temurin
+tomcat:10.1.26-jdk11-temurin-jammy
+tomcat:10.1.26-jdk17
+tomcat:10.1.26-jdk17-temurin
+tomcat:10.1.26-jdk17-temurin-jammy
+tomcat:10.1.26-jdk21
+tomcat:10.1.26-jdk21-temurin
+tomcat:10.1.26-jdk21-temurin-jammy
+tomcat:10.1.26-jre11
+tomcat:10.1.26-jre11-temurin
+tomcat:10.1.26-jre11-temurin-jammy
+tomcat:10.1.26-jre17
+tomcat:10.1.26-jre17-temurin
+tomcat:10.1.26-jre17-temurin-jammy
+tomcat:10.1.26-jre21
+tomcat:10.1.26-jre21-temurin
+tomcat:10.1.26-jre21-temurin-jammy
 tomcat:11.0
 tomcat:11.0-jdk21
 tomcat:11.0-jdk21-temurin
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_jdk11/Dockerfile
index 55ae347..a7f320b 100644
--- a/tomcat_jdk11/Dockerfile
+++ b/tomcat_jdk11/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.25
-ENV TOMCAT_SHA512 d7498e23e54425d728ed3481579dccc4fe3d720a4b6d491ce9a04f9d19647b60a398b76dbfec63a32f7ee98195b97231d34b6f850283f38a1acb9908d3015565
+ENV TOMCAT_VERSION 10.1.26
+ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
 RUN set -eux; \
 	\
diff --git a/tomcat_jdk17/Dockerfile b/tomcat_jdk17/Dockerfile
index de6aaf8..b2e27fb 100644
--- a/tomcat_jdk17/Dockerfile
+++ b/tomcat_jdk17/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.25
-ENV TOMCAT_SHA512 d7498e23e54425d728ed3481579dccc4fe3d720a4b6d491ce9a04f9d19647b60a398b76dbfec63a32f7ee98195b97231d34b6f850283f38a1acb9908d3015565
+ENV TOMCAT_VERSION 10.1.26
+ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
 RUN set -eux; \
 	\
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11/Dockerfile
index 3a948e8..4c53bed 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_jre11/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.25
-ENV TOMCAT_SHA512 d7498e23e54425d728ed3481579dccc4fe3d720a4b6d491ce9a04f9d19647b60a398b76dbfec63a32f7ee98195b97231d34b6f850283f38a1acb9908d3015565
+ENV TOMCAT_VERSION 10.1.26
+ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
-COPY --from=tomcat:10.1.25-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.26-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_jre17/Dockerfile
index 472cda5..cc21173 100644
--- a/tomcat_jre17/Dockerfile
+++ b/tomcat_jre17/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.25
-ENV TOMCAT_SHA512 d7498e23e54425d728ed3481579dccc4fe3d720a4b6d491ce9a04f9d19647b60a398b76dbfec63a32f7ee98195b97231d34b6f850283f38a1acb9908d3015565
+ENV TOMCAT_VERSION 10.1.26
+ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
-COPY --from=tomcat:10.1.25-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.26-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_jre21/Dockerfile b/tomcat_jre21/Dockerfile
index 1b4a022..6a9af47 100644
--- a/tomcat_jre21/Dockerfile
+++ b/tomcat_jre21/Dockerfile
@@ -20,10 +20,10 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.25
-ENV TOMCAT_SHA512 d7498e23e54425d728ed3481579dccc4fe3d720a4b6d491ce9a04f9d19647b60a398b76dbfec63a32f7ee98195b97231d34b6f850283f38a1acb9908d3015565
+ENV TOMCAT_VERSION 10.1.26
+ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
-COPY --from=tomcat:10.1.25-jdk21-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.26-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_latest/Dockerfile b/tomcat_latest/Dockerfile
index 7008d57..65f7eb5 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_latest/Dockerfile
@@ -20,8 +20,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 5C3C5F3E314C866292F359A8F3AD5C94A67F707E A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.25
-ENV TOMCAT_SHA512 d7498e23e54425d728ed3481579dccc4fe3d720a4b6d491ce9a04f9d19647b60a398b76dbfec63a32f7ee98195b97231d34b6f850283f38a1acb9908d3015565
+ENV TOMCAT_VERSION 10.1.26
+ENV TOMCAT_SHA512 0a62e55c1ff9f8f04d7aff938764eac46c289eda888abf43de74a82ceb7d879e94a36ea3e5e46186bc231f07871fcc4c58f11e026f51d4487a473badb21e9355
 
 RUN set -eux; \
 	\

Relevant Maintainers:

@yosifkit yosifkit merged commit ad47c38 into docker-library:master Jul 12, 2024
20 checks passed
@yosifkit yosifkit deleted the tomcat branch July 12, 2024 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

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