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

Merged
merged 1 commit into from
Apr 12, 2019
Merged

Update tomcat #5735

merged 1 commit into from
Apr 12, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Apr 12, 2019

Changes:

Changes:

- docker-library/tomcat@2d96f91: Update to 8.5.40
- docker-library/tomcat@7dd0c6e: Update to 7.0.94, openssl 1.1.0j-1~deb9u1
- docker-library/tomcat@47c2004: Update to 7.0.94
- docker-library/tomcat@f463e9e: Update to 8.5.40, openssl 1.1.0j-1~deb9u1
@tianon
Copy link
Member Author

tianon commented Apr 12, 2019

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index f259515..fcddc04 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -16,15 +16,15 @@ tomcat:7.0-jre8
 tomcat:7.0-jre8-alpine
 tomcat:7.0-jre8-slim
 tomcat:7.0-slim
-tomcat:7.0.93
-tomcat:7.0.93-alpine
-tomcat:7.0.93-jre7
-tomcat:7.0.93-jre7-alpine
-tomcat:7.0.93-jre7-slim
-tomcat:7.0.93-jre8
-tomcat:7.0.93-jre8-alpine
-tomcat:7.0.93-jre8-slim
-tomcat:7.0.93-slim
+tomcat:7.0.94
+tomcat:7.0.94-alpine
+tomcat:7.0.94-jre7
+tomcat:7.0.94-jre7-alpine
+tomcat:7.0.94-jre7-slim
+tomcat:7.0.94-jre8
+tomcat:7.0.94-jre8-alpine
+tomcat:7.0.94-jre8-slim
+tomcat:7.0.94-slim
 tomcat:8
 tomcat:8-alpine
 tomcat:8-jre8
@@ -41,14 +41,14 @@ tomcat:8.5-jre8-slim
 tomcat:8.5-jre11
 tomcat:8.5-jre11-slim
 tomcat:8.5-slim
-tomcat:8.5.39
-tomcat:8.5.39-alpine
-tomcat:8.5.39-jre8
-tomcat:8.5.39-jre8-alpine
-tomcat:8.5.39-jre8-slim
-tomcat:8.5.39-jre11
-tomcat:8.5.39-jre11-slim
-tomcat:8.5.39-slim
+tomcat:8.5.40
+tomcat:8.5.40-alpine
+tomcat:8.5.40-jre8
+tomcat:8.5.40-jre8-alpine
+tomcat:8.5.40-jre8-slim
+tomcat:8.5.40-jre11
+tomcat:8.5.40-jre11-slim
+tomcat:8.5.40-slim
 tomcat:9-jre8
 tomcat:9-jre8-alpine
 tomcat:9-jre8-slim
diff --git a/tomcat_7-alpine/Dockerfile b/tomcat_7-alpine/Dockerfile
index ac4f2b6..ce498fd 100644
--- a/tomcat_7-alpine/Dockerfile
+++ b/tomcat_7-alpine/Dockerfile
@@ -14,8 +14,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.93
-ENV TOMCAT_SHA512 7ae5186f63df7821b7de4e4c92780a27ccc678119614ad074349c3d02bd2f764ac08fa72f776e880e98aad2617de01521eb3de6fe57e4a749c8c04f28e042f0a
+ENV TOMCAT_VERSION 7.0.94
+ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_7-jre8-alpine/Dockerfile b/tomcat_7-jre8-alpine/Dockerfile
index f61da2b..351ba02 100644
--- a/tomcat_7-jre8-alpine/Dockerfile
+++ b/tomcat_7-jre8-alpine/Dockerfile
@@ -14,8 +14,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.93
-ENV TOMCAT_SHA512 7ae5186f63df7821b7de4e4c92780a27ccc678119614ad074349c3d02bd2f764ac08fa72f776e880e98aad2617de01521eb3de6fe57e4a749c8c04f28e042f0a
+ENV TOMCAT_VERSION 7.0.94
+ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_7-jre8-slim/Dockerfile b/tomcat_7-jre8-slim/Dockerfile
index 752fbab..a7b7a8a 100644
--- a/tomcat_7-jre8-slim/Dockerfile
+++ b/tomcat_7-jre8-slim/Dockerfile
@@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.93
-ENV TOMCAT_SHA512 7ae5186f63df7821b7de4e4c92780a27ccc678119614ad074349c3d02bd2f764ac08fa72f776e880e98aad2617de01521eb3de6fe57e4a749c8c04f28e042f0a
+ENV TOMCAT_VERSION 7.0.94
+ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_7-jre8/Dockerfile b/tomcat_7-jre8/Dockerfile
index 36d2afd..9aead7f 100644
--- a/tomcat_7-jre8/Dockerfile
+++ b/tomcat_7-jre8/Dockerfile
@@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.93
-ENV TOMCAT_SHA512 7ae5186f63df7821b7de4e4c92780a27ccc678119614ad074349c3d02bd2f764ac08fa72f776e880e98aad2617de01521eb3de6fe57e4a749c8c04f28e042f0a
+ENV TOMCAT_VERSION 7.0.94
+ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_7-slim/Dockerfile b/tomcat_7-slim/Dockerfile
index c0f9ea4..e3ba9e2 100644
--- a/tomcat_7-slim/Dockerfile
+++ b/tomcat_7-slim/Dockerfile
@@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.93
-ENV TOMCAT_SHA512 7ae5186f63df7821b7de4e4c92780a27ccc678119614ad074349c3d02bd2f764ac08fa72f776e880e98aad2617de01521eb3de6fe57e4a749c8c04f28e042f0a
+ENV TOMCAT_VERSION 7.0.94
+ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_7/Dockerfile b/tomcat_7/Dockerfile
index da7d686..f9c9450 100644
--- a/tomcat_7/Dockerfile
+++ b/tomcat_7/Dockerfile
@@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.93
-ENV TOMCAT_SHA512 7ae5186f63df7821b7de4e4c92780a27ccc678119614ad074349c3d02bd2f764ac08fa72f776e880e98aad2617de01521eb3de6fe57e4a749c8c04f28e042f0a
+ENV TOMCAT_VERSION 7.0.94
+ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_alpine/Dockerfile b/tomcat_alpine/Dockerfile
index 62d7951..ad7307c 100644
--- a/tomcat_alpine/Dockerfile
+++ b/tomcat_alpine/Dockerfile
@@ -14,8 +14,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.39
-ENV TOMCAT_SHA512 8396f526eca9b691931cfa773f43c5190e7002d938cb253335b65a32c7ef8acba2bf7c61f2ccffc4113a3ba0c46169a4e4797cdea73db32c5ba56156a9f49353
+ENV TOMCAT_VERSION 8.5.40
+ENV TOMCAT_SHA512 5bdea5414713c9ba39e226f062701fa14998b1a798c9750f956a0f59b5edabb8d83af9ec9f81cf9f47fa92c21b560c9b2be1b543d0bd8f1b49579b69101d3a8f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_jre11-slim/Dockerfile b/tomcat_jre11-slim/Dockerfile
index 08086cd..d0e7786 100644
--- a/tomcat_jre11-slim/Dockerfile
+++ b/tomcat_jre11-slim/Dockerfile
@@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.39
-ENV TOMCAT_SHA512 8396f526eca9b691931cfa773f43c5190e7002d938cb253335b65a32c7ef8acba2bf7c61f2ccffc4113a3ba0c46169a4e4797cdea73db32c5ba56156a9f49353
+ENV TOMCAT_VERSION 8.5.40
+ENV TOMCAT_SHA512 5bdea5414713c9ba39e226f062701fa14998b1a798c9750f956a0f59b5edabb8d83af9ec9f81cf9f47fa92c21b560c9b2be1b543d0bd8f1b49579b69101d3a8f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11/Dockerfile
index 87bca0c..6271de7 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_jre11/Dockerfile
@@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.39
-ENV TOMCAT_SHA512 8396f526eca9b691931cfa773f43c5190e7002d938cb253335b65a32c7ef8acba2bf7c61f2ccffc4113a3ba0c46169a4e4797cdea73db32c5ba56156a9f49353
+ENV TOMCAT_VERSION 8.5.40
+ENV TOMCAT_SHA512 5bdea5414713c9ba39e226f062701fa14998b1a798c9750f956a0f59b5edabb8d83af9ec9f81cf9f47fa92c21b560c9b2be1b543d0bd8f1b49579b69101d3a8f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_latest/Dockerfile b/tomcat_latest/Dockerfile
index df20d8b..1274f6c 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_latest/Dockerfile
@@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.39
-ENV TOMCAT_SHA512 8396f526eca9b691931cfa773f43c5190e7002d938cb253335b65a32c7ef8acba2bf7c61f2ccffc4113a3ba0c46169a4e4797cdea73db32c5ba56156a9f49353
+ENV TOMCAT_VERSION 8.5.40
+ENV TOMCAT_SHA512 5bdea5414713c9ba39e226f062701fa14998b1a798c9750f956a0f59b5edabb8d83af9ec9f81cf9f47fa92c21b560c9b2be1b543d0bd8f1b49579b69101d3a8f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
diff --git a/tomcat_slim/Dockerfile b/tomcat_slim/Dockerfile
index 1ae806d..4d07f3c 100644
--- a/tomcat_slim/Dockerfile
+++ b/tomcat_slim/Dockerfile
@@ -52,8 +52,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.5.39
-ENV TOMCAT_SHA512 8396f526eca9b691931cfa773f43c5190e7002d938cb253335b65a32c7ef8acba2bf7c61f2ccffc4113a3ba0c46169a4e4797cdea73db32c5ba56156a9f49353
+ENV TOMCAT_VERSION 8.5.40
+ENV TOMCAT_SHA512 5bdea5414713c9ba39e226f062701fa14998b1a798c9750f956a0f59b5edabb8d83af9ec9f81cf9f47fa92c21b560c9b2be1b543d0bd8f1b49579b69101d3a8f
 
 ENV TOMCAT_TGZ_URLS \
 # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394

@tianon
Copy link
Member Author

tianon commented Apr 12, 2019

Build test of #5735; a2642fb; amd64 (tomcat):

$ bashbrew build tomcat:7.0.94-jre7
Building bashbrew/cache:d8b7eff620d1aa08a38680c7136b5d4a28cf54a9c47528d13b0460e97d9a05f0 (tomcat:7.0.94-jre7)
Tagging tomcat:7.0.94-jre7
Tagging tomcat:7.0-jre7
Tagging tomcat:7-jre7
Tagging tomcat:7.0.94
Tagging tomcat:7.0
Tagging tomcat:7

$ test/run.sh tomcat:7.0.94-jre7
testing tomcat:7.0.94-jre7
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.94-jre7-slim
Building bashbrew/cache:f9aeac5f26e413589061b69a02e1de6fbbd867cc476b74e8aef27f3182af67f2 (tomcat:7.0.94-jre7-slim)
Tagging tomcat:7.0.94-jre7-slim
Tagging tomcat:7.0-jre7-slim
Tagging tomcat:7-jre7-slim
Tagging tomcat:7.0.94-slim
Tagging tomcat:7.0-slim
Tagging tomcat:7-slim

$ test/run.sh tomcat:7.0.94-jre7-slim
testing tomcat:7.0.94-jre7-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.94-jre7-alpine
Building bashbrew/cache:8000c8860670c7162bb82a845199d40935b0faaaf211735557a0a9f7ae49744f (tomcat:7.0.94-jre7-alpine)
Tagging tomcat:7.0.94-jre7-alpine
Tagging tomcat:7.0-jre7-alpine
Tagging tomcat:7-jre7-alpine
Tagging tomcat:7.0.94-alpine
Tagging tomcat:7.0-alpine
Tagging tomcat:7-alpine

$ test/run.sh tomcat:7.0.94-jre7-alpine
testing tomcat:7.0.94-jre7-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.94-jre8
Building bashbrew/cache:4ccca2e0c145ae11c1ec9a4f0d7d0e35a6588ab56c2e7f29d0c1835a113187c9 (tomcat:7.0.94-jre8)
Tagging tomcat:7.0.94-jre8
Tagging tomcat:7.0-jre8
Tagging tomcat:7-jre8

$ test/run.sh tomcat:7.0.94-jre8
testing tomcat:7.0.94-jre8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.94-jre8-slim
Building bashbrew/cache:2353417f60f600871d92829142c88b3753f4f4191c5a6d0d7e7da464c89ac597 (tomcat:7.0.94-jre8-slim)
Tagging tomcat:7.0.94-jre8-slim
Tagging tomcat:7.0-jre8-slim
Tagging tomcat:7-jre8-slim

$ test/run.sh tomcat:7.0.94-jre8-slim
testing tomcat:7.0.94-jre8-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.94-jre8-alpine
Building bashbrew/cache:7c12227d42f38ba377cd05020c4df35aeda056090e291674a3d511cae8f61c74 (tomcat:7.0.94-jre8-alpine)
Tagging tomcat:7.0.94-jre8-alpine
Tagging tomcat:7.0-jre8-alpine
Tagging tomcat:7-jre8-alpine

$ test/run.sh tomcat:7.0.94-jre8-alpine
testing tomcat:7.0.94-jre8-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.5.40-jre8
Building bashbrew/cache:14f79feda764877a430256c8b66350dff1be3bbd363dcdd285aa013c36b8e767 (tomcat:8.5.40-jre8)
Tagging tomcat:8.5.40-jre8
Tagging tomcat:8.5-jre8
Tagging tomcat:8-jre8
Tagging tomcat:jre8
Tagging tomcat:8.5.40
Tagging tomcat:8.5
Tagging tomcat:8
Tagging tomcat:latest

$ test/run.sh tomcat:8.5.40-jre8
testing tomcat:8.5.40-jre8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]...passed


$ bashbrew build tomcat:8.5.40-jre8-slim
Building bashbrew/cache:b438d7006213f4e68aea91bbdf8c89548c518be86c81764a26bc178edde3c850 (tomcat:8.5.40-jre8-slim)
Tagging tomcat:8.5.40-jre8-slim
Tagging tomcat:8.5-jre8-slim
Tagging tomcat:8-jre8-slim
Tagging tomcat:jre8-slim
Tagging tomcat:8.5.40-slim
Tagging tomcat:8.5-slim
Tagging tomcat:8-slim
Tagging tomcat:slim

$ test/run.sh tomcat:8.5.40-jre8-slim
testing tomcat:8.5.40-jre8-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]...passed


$ bashbrew build tomcat:8.5.40-jre8-alpine
Building bashbrew/cache:13b99a563f556a82b247c1d189e5712690749278a996f2acbc7555cf8712b405 (tomcat:8.5.40-jre8-alpine)
Tagging tomcat:8.5.40-jre8-alpine
Tagging tomcat:8.5-jre8-alpine
Tagging tomcat:8-jre8-alpine
Tagging tomcat:jre8-alpine
Tagging tomcat:8.5.40-alpine
Tagging tomcat:8.5-alpine
Tagging tomcat:8-alpine
Tagging tomcat:alpine

$ test/run.sh tomcat:8.5.40-jre8-alpine
testing tomcat:8.5.40-jre8-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.5.40-jre11
Building bashbrew/cache:0452a8585215096bbdb73f1c3bd217aaebc2a185315709b989c6863dcfbf7e73 (tomcat:8.5.40-jre11)
Tagging tomcat:8.5.40-jre11
Tagging tomcat:8.5-jre11
Tagging tomcat:8-jre11
Tagging tomcat:jre11

$ test/run.sh tomcat:8.5.40-jre11
testing tomcat:8.5.40-jre11
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.5.40-jre11-slim
Building bashbrew/cache:8c370e4d2043c2d0c931b3e6b9d56189032573c626169d93a657c84116b7a513 (tomcat:8.5.40-jre11-slim)
Tagging tomcat:8.5.40-jre11-slim
Tagging tomcat:8.5-jre11-slim
Tagging tomcat:8-jre11-slim
Tagging tomcat:jre11-slim

$ test/run.sh tomcat:8.5.40-jre11-slim
testing tomcat:8.5.40-jre11-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]...passed


$ bashbrew build tomcat:9.0.17-jre8
Building bashbrew/cache:0c760d33f487d77b76fcdfda5c540e2eceafc8162ad5f4fc9e1c38dab46affc4 (tomcat:9.0.17-jre8)
Tagging tomcat:9.0.17-jre8
Tagging tomcat:9.0-jre8
Tagging tomcat:9-jre8

$ test/run.sh tomcat:9.0.17-jre8
testing tomcat:9.0.17-jre8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]...passed


$ bashbrew build tomcat:9.0.17-jre8-slim
Using bashbrew/cache:136b41f735244f6235b18c47b15a6c07fcc1eeea54adf29942b7119346884ffa (tomcat:9.0.17-jre8-slim)
Tagging tomcat:9.0.17-jre8-slim
Tagging tomcat:9.0-jre8-slim
Tagging tomcat:9-jre8-slim

$ test/run.sh tomcat:9.0.17-jre8-slim
testing tomcat:9.0.17-jre8-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]...passed


$ bashbrew build tomcat:9.0.17-jre8-alpine
Building bashbrew/cache:ddddb9c7de6ffc4156878faf7e1128d028fe557373d467d47b66d1e8b22b84da (tomcat:9.0.17-jre8-alpine)
Tagging tomcat:9.0.17-jre8-alpine
Tagging tomcat:9.0-jre8-alpine
Tagging tomcat:9-jre8-alpine

$ test/run.sh tomcat:9.0.17-jre8-alpine
testing tomcat:9.0.17-jre8-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:9.0.17-jre11
Building bashbrew/cache:b6cacc85fbccbbfad4bb2b3509d9851fcab468d014c60d874c354f374643d0a4 (tomcat:9.0.17-jre11)
Tagging tomcat:9.0.17-jre11
Tagging tomcat:9.0-jre11
Tagging tomcat:9-jre11

$ test/run.sh tomcat:9.0.17-jre11
testing tomcat:9.0.17-jre11
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]...passed


$ bashbrew build tomcat:9.0.17-jre11-slim
Building bashbrew/cache:bdb9482a873e1b288b48e575e103cbdd5b2199ad6e1ebbbc66bf55fe064bd368 (tomcat:9.0.17-jre11-slim)
Tagging tomcat:9.0.17-jre11-slim
Tagging tomcat:9.0-jre11-slim
Tagging tomcat:9-jre11-slim

$ test/run.sh tomcat:9.0.17-jre11-slim
testing tomcat:9.0.17-jre11-slim
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'tomcat-hello-world' [5/5]....passed

@tianon tianon merged commit cd0f98f into docker-library:master Apr 12, 2019
@tianon tianon deleted the tomcat branch April 12, 2019 22:25
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