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

Merged
merged 1 commit into from
Dec 9, 2022
Merged

Update tomcat #13703

merged 1 commit into from
Dec 9, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 9, 2022

Changes:

Changes:

- docker-library/tomcat@965cb2b: Update 10.1 to 10.1.4
@github-actions
Copy link

github-actions bot commented Dec 9, 2022

Diff for e7c4b42:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6854000..7658210 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -226,24 +226,24 @@ Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: f7001f11cfff80d925033cdbcd52e4c0fc679095
 Directory: 10.0/jre17/temurin-jammy
 
-Tags: 10.1.2-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.1.2-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.2-jdk11, 10.1-jdk11, 10-jdk11, jdk11
+Tags: 10.1.4-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.1.4-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.4-jdk11, 10.1-jdk11, 10-jdk11, jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f5728d643f53670ab3d10ac98b74be076190be3a
+GitCommit: 965cb2bd977f06070f51a28058692d5604f341f6
 Directory: 10.1/jdk11/temurin-jammy
 
-Tags: 10.1.2-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.1.2-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.2-jdk17, 10.1-jdk17, 10-jdk17, jdk17, 10.1.2, 10.1, 10, latest
+Tags: 10.1.4-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.1.4-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.4-jdk17, 10.1-jdk17, 10-jdk17, jdk17, 10.1.4, 10.1, 10, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f5728d643f53670ab3d10ac98b74be076190be3a
+GitCommit: 965cb2bd977f06070f51a28058692d5604f341f6
 Directory: 10.1/jdk17/temurin-jammy
 
-Tags: 10.1.2-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.2-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.2-jre11, 10.1-jre11, 10-jre11, jre11
+Tags: 10.1.4-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.4-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.4-jre11, 10.1-jre11, 10-jre11, jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f5728d643f53670ab3d10ac98b74be076190be3a
+GitCommit: 965cb2bd977f06070f51a28058692d5604f341f6
 Directory: 10.1/jre11/temurin-jammy
 
-Tags: 10.1.2-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy, 10.1.2-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.2-jre17, 10.1-jre17, 10-jre17, jre17
+Tags: 10.1.4-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy, 10.1.4-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.4-jre17, 10.1-jre17, 10-jre17, jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f5728d643f53670ab3d10ac98b74be076190be3a
+GitCommit: 965cb2bd977f06070f51a28058692d5604f341f6
 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
diff --git a/_bashbrew-list b/_bashbrew-list
index daf7048..58c1c64 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -272,19 +272,19 @@ tomcat:10.1-jre11-temurin-jammy
 tomcat:10.1-jre17
 tomcat:10.1-jre17-temurin
 tomcat:10.1-jre17-temurin-jammy
-tomcat:10.1.2
-tomcat:10.1.2-jdk11
-tomcat:10.1.2-jdk11-temurin
-tomcat:10.1.2-jdk11-temurin-jammy
-tomcat:10.1.2-jdk17
-tomcat:10.1.2-jdk17-temurin
-tomcat:10.1.2-jdk17-temurin-jammy
-tomcat:10.1.2-jre11
-tomcat:10.1.2-jre11-temurin
-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:10.1.4
+tomcat:10.1.4-jdk11
+tomcat:10.1.4-jdk11-temurin
+tomcat:10.1.4-jdk11-temurin-jammy
+tomcat:10.1.4-jdk17
+tomcat:10.1.4-jdk17-temurin
+tomcat:10.1.4-jdk17-temurin-jammy
+tomcat:10.1.4-jre11
+tomcat:10.1.4-jre11-temurin
+tomcat:10.1.4-jre11-temurin-jammy
+tomcat:10.1.4-jre17
+tomcat:10.1.4-jre17-temurin
+tomcat:10.1.4-jre17-temurin-jammy
 tomcat:11.0
 tomcat:11.0-jdk11
 tomcat:11.0-jdk11-temurin
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_jdk11/Dockerfile
index 413d7c1..5c8987d 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 A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.2
-ENV TOMCAT_SHA512 50e933934cbf2915603264dfd245db0137491555d71d4fe8a535a7a8b6bc36bb4984e8bb2f38c968fbfc84a87aeeaa773ce1c6ee5f2eaa87780d1869251da51e
+ENV TOMCAT_VERSION 10.1.4
+ENV TOMCAT_SHA512 f54f4298e59fb2085bb9720db06479956eb77c354a9210d56361c105814d2cb020edde9eb093077ed9d8c09cc9cda9c686d8f78488affb37c9a14abceeb27534
 
 RUN set -eux; \
 	\
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11/Dockerfile
index e8d11be..a55d9e7 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 A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.2
-ENV TOMCAT_SHA512 50e933934cbf2915603264dfd245db0137491555d71d4fe8a535a7a8b6bc36bb4984e8bb2f38c968fbfc84a87aeeaa773ce1c6ee5f2eaa87780d1869251da51e
+ENV TOMCAT_VERSION 10.1.4
+ENV TOMCAT_SHA512 f54f4298e59fb2085bb9720db06479956eb77c354a9210d56361c105814d2cb020edde9eb093077ed9d8c09cc9cda9c686d8f78488affb37c9a14abceeb27534
 
-COPY --from=tomcat:10.1.2-jdk11-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.4-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 15596e0..a172bb3 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 A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.2
-ENV TOMCAT_SHA512 50e933934cbf2915603264dfd245db0137491555d71d4fe8a535a7a8b6bc36bb4984e8bb2f38c968fbfc84a87aeeaa773ce1c6ee5f2eaa87780d1869251da51e
+ENV TOMCAT_VERSION 10.1.4
+ENV TOMCAT_SHA512 f54f4298e59fb2085bb9720db06479956eb77c354a9210d56361c105814d2cb020edde9eb093077ed9d8c09cc9cda9c686d8f78488affb37c9a14abceeb27534
 
-COPY --from=tomcat:10.1.2-jdk17-temurin-jammy $CATALINA_HOME $CATALINA_HOME
+COPY --from=tomcat:10.1.4-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_latest/Dockerfile
index 256a787..597859f 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 A9C5DF4D22E99998D9875A5110C01C5A2F6059E7
 
 ENV TOMCAT_MAJOR 10
-ENV TOMCAT_VERSION 10.1.2
-ENV TOMCAT_SHA512 50e933934cbf2915603264dfd245db0137491555d71d4fe8a535a7a8b6bc36bb4984e8bb2f38c968fbfc84a87aeeaa773ce1c6ee5f2eaa87780d1869251da51e
+ENV TOMCAT_VERSION 10.1.4
+ENV TOMCAT_SHA512 f54f4298e59fb2085bb9720db06479956eb77c354a9210d56361c105814d2cb020edde9eb093077ed9d8c09cc9cda9c686d8f78488affb37c9a14abceeb27534
 
 RUN set -eux; \
 	\

Relevant Maintainers:

@yosifkit yosifkit merged commit f6a96e5 into docker-library:master Dec 9, 2022
@yosifkit yosifkit deleted the tomcat branch December 9, 2022 19:55
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