Update tomcat

Changes:

- https://github.com/docker-library/tomcat/commit/c2d6f94: Merge pull request https://github.com/docker-library/tomcat/pull/205 from infosiftr/refactor
- https://github.com/docker-library/tomcat/commit/20a00bb: Refactor around more explicit "openjdk" base images

library/tomcat

@@ -1,33 +1,33 @@
-# this file is generated via https://github.com/docker-library/tomcat/blob/8aed00cdb1a1f1496895784e80f239079dcee411/generate-stackbrew-library.sh
+# this file is generated via https://github.com/docker-library/tomcat/blob/20a00bb175913f9597ba3831bacbe99d2a470403/generate-stackbrew-library.sh
 
 Maintainers: Tianon Gravi <[email protected]> (@tianon),
              Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/tomcat.git
 
-Tags: 10.0.0-M7-jdk14-openjdk-oracle, 10.0.0-jdk14-openjdk-oracle, 10.0-jdk14-openjdk-oracle, 10-jdk14-openjdk-oracle
+Tags: 10.0.0-M7-jdk14-openjdk-oraclelinux7, 10.0.0-jdk14-openjdk-oraclelinux7, 10.0-jdk14-openjdk-oraclelinux7, 10-jdk14-openjdk-oraclelinux7, 10.0.0-M7-jdk14-openjdk-oracle, 10.0.0-jdk14-openjdk-oracle, 10.0-jdk14-openjdk-oracle, 10-jdk14-openjdk-oracle
 Architectures: amd64
-GitCommit: e73dea3152275683d921eccac10f415ec530a183
-Directory: 10.0/jdk14/openjdk-oracle
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 10.0/jdk14/openjdk-oraclelinux7
 
-Tags: 10.0.0-M7-jdk14-openjdk-buster, 10.0.0-jdk14-openjdk-buster, 10.0-jdk14-openjdk-buster, 10-jdk14-openjdk-buster
+Tags: 10.0.0-M7-jdk14-openjdk-buster, 10.0.0-jdk14-openjdk-buster, 10.0-jdk14-openjdk-buster, 10-jdk14-openjdk-buster, 10.0.0-M7-jdk14-openjdk, 10.0.0-jdk14-openjdk, 10.0-jdk14-openjdk, 10-jdk14-openjdk, 10.0.0-M7-jdk14, 10.0.0-jdk14, 10.0-jdk14, 10-jdk14
 Architectures: amd64
 GitCommit: e73dea3152275683d921eccac10f415ec530a183
 Directory: 10.0/jdk14/openjdk-buster
 
-Tags: 10.0.0-M7-jdk14-openjdk-slim-buster, 10.0.0-jdk14-openjdk-slim-buster, 10.0-jdk14-openjdk-slim-buster, 10-jdk14-openjdk-slim-buster
+Tags: 10.0.0-M7-jdk14-openjdk-slim-buster, 10.0.0-jdk14-openjdk-slim-buster, 10.0-jdk14-openjdk-slim-buster, 10-jdk14-openjdk-slim-buster, 10.0.0-M7-jdk14-openjdk-slim, 10.0.0-jdk14-openjdk-slim, 10.0-jdk14-openjdk-slim, 10-jdk14-openjdk-slim
 Architectures: amd64
 GitCommit: e73dea3152275683d921eccac10f415ec530a183
 Directory: 10.0/jdk14/openjdk-slim-buster
 
-Tags: 10.0.0-M7-jdk11-openjdk, 10.0.0-jdk11-openjdk, 10.0-jdk11-openjdk, 10-jdk11-openjdk, 10.0.0-M7-jdk11, 10.0.0-jdk11, 10.0-jdk11, 10-jdk11, 10.0.0-M7, 10.0.0, 10.0, 10
+Tags: 10.0.0-M7-jdk11-openjdk-buster, 10.0.0-jdk11-openjdk-buster, 10.0-jdk11-openjdk-buster, 10-jdk11-openjdk-buster, 10.0.0-M7-jdk11-openjdk, 10.0.0-jdk11-openjdk, 10.0-jdk11-openjdk, 10-jdk11-openjdk, 10.0.0-M7-jdk11, 10.0.0-jdk11, 10.0-jdk11, 10-jdk11, 10.0.0-M7, 10.0.0, 10.0, 10
 Architectures: amd64, arm64v8
-GitCommit: e73dea3152275683d921eccac10f415ec530a183
-Directory: 10.0/jdk11/openjdk
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 10.0/jdk11/openjdk-buster
 
-Tags: 10.0.0-M7-jdk11-openjdk-slim, 10.0.0-jdk11-openjdk-slim, 10.0-jdk11-openjdk-slim, 10-jdk11-openjdk-slim
+Tags: 10.0.0-M7-jdk11-openjdk-slim-buster, 10.0.0-jdk11-openjdk-slim-buster, 10.0-jdk11-openjdk-slim-buster, 10-jdk11-openjdk-slim-buster, 10.0.0-M7-jdk11-openjdk-slim, 10.0.0-jdk11-openjdk-slim, 10.0-jdk11-openjdk-slim, 10-jdk11-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: e73dea3152275683d921eccac10f415ec530a183
-Directory: 10.0/jdk11/openjdk-slim
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 10.0/jdk11/openjdk-slim-buster
 
 Tags: 10.0.0-M7-jdk11-adoptopenjdk-hotspot, 10.0.0-jdk11-adoptopenjdk-hotspot, 10.0-jdk11-adoptopenjdk-hotspot, 10-jdk11-adoptopenjdk-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -44,15 +44,15 @@ Architectures: amd64, arm64v8
 GitCommit: e73dea3152275683d921eccac10f415ec530a183
 Directory: 10.0/jdk11/corretto
 
-Tags: 10.0.0-M7-jdk8-openjdk, 10.0.0-jdk8-openjdk, 10.0-jdk8-openjdk, 10-jdk8-openjdk, 10.0.0-M7-jdk8, 10.0.0-jdk8, 10.0-jdk8, 10-jdk8
+Tags: 10.0.0-M7-jdk8-openjdk-buster, 10.0.0-jdk8-openjdk-buster, 10.0-jdk8-openjdk-buster, 10-jdk8-openjdk-buster, 10.0.0-M7-jdk8-openjdk, 10.0.0-jdk8-openjdk, 10.0-jdk8-openjdk, 10-jdk8-openjdk, 10.0.0-M7-jdk8, 10.0.0-jdk8, 10.0-jdk8, 10-jdk8
 Architectures: amd64
-GitCommit: e73dea3152275683d921eccac10f415ec530a183
-Directory: 10.0/jdk8/openjdk
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 10.0/jdk8/openjdk-buster
 
-Tags: 10.0.0-M7-jdk8-openjdk-slim, 10.0.0-jdk8-openjdk-slim, 10.0-jdk8-openjdk-slim, 10-jdk8-openjdk-slim
+Tags: 10.0.0-M7-jdk8-openjdk-slim-buster, 10.0.0-jdk8-openjdk-slim-buster, 10.0-jdk8-openjdk-slim-buster, 10-jdk8-openjdk-slim-buster, 10.0.0-M7-jdk8-openjdk-slim, 10.0.0-jdk8-openjdk-slim, 10.0-jdk8-openjdk-slim, 10-jdk8-openjdk-slim
 Architectures: amd64
-GitCommit: e73dea3152275683d921eccac10f415ec530a183
-Directory: 10.0/jdk8/openjdk-slim
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 10.0/jdk8/openjdk-slim-buster
 
 Tags: 10.0.0-M7-jdk8-adoptopenjdk-hotspot, 10.0.0-jdk8-adoptopenjdk-hotspot, 10.0-jdk8-adoptopenjdk-hotspot, 10-jdk8-adoptopenjdk-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -69,30 +69,30 @@ Architectures: amd64, arm64v8
 GitCommit: e73dea3152275683d921eccac10f415ec530a183
 Directory: 10.0/jdk8/corretto
 
-Tags: 9.0.37-jdk14-openjdk-oracle, 9.0-jdk14-openjdk-oracle, 9-jdk14-openjdk-oracle, jdk14-openjdk-oracle
+Tags: 9.0.37-jdk14-openjdk-oraclelinux7, 9.0-jdk14-openjdk-oraclelinux7, 9-jdk14-openjdk-oraclelinux7, jdk14-openjdk-oraclelinux7, 9.0.37-jdk14-openjdk-oracle, 9.0-jdk14-openjdk-oracle, 9-jdk14-openjdk-oracle, jdk14-openjdk-oracle
 Architectures: amd64
-GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
-Directory: 9.0/jdk14/openjdk-oracle
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 9.0/jdk14/openjdk-oraclelinux7
 
-Tags: 9.0.37-jdk14-openjdk-buster, 9.0-jdk14-openjdk-buster, 9-jdk14-openjdk-buster, jdk14-openjdk-buster
+Tags: 9.0.37-jdk14-openjdk-buster, 9.0-jdk14-openjdk-buster, 9-jdk14-openjdk-buster, jdk14-openjdk-buster, 9.0.37-jdk14-openjdk, 9.0-jdk14-openjdk, 9-jdk14-openjdk, jdk14-openjdk, 9.0.37-jdk14, 9.0-jdk14, 9-jdk14, jdk14
 Architectures: amd64
 GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
 Directory: 9.0/jdk14/openjdk-buster
 
-Tags: 9.0.37-jdk14-openjdk-slim-buster, 9.0-jdk14-openjdk-slim-buster, 9-jdk14-openjdk-slim-buster, jdk14-openjdk-slim-buster
+Tags: 9.0.37-jdk14-openjdk-slim-buster, 9.0-jdk14-openjdk-slim-buster, 9-jdk14-openjdk-slim-buster, jdk14-openjdk-slim-buster, 9.0.37-jdk14-openjdk-slim, 9.0-jdk14-openjdk-slim, 9-jdk14-openjdk-slim, jdk14-openjdk-slim
 Architectures: amd64
 GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
 Directory: 9.0/jdk14/openjdk-slim-buster
 
-Tags: 9.0.37-jdk11-openjdk, 9.0-jdk11-openjdk, 9-jdk11-openjdk, jdk11-openjdk, 9.0.37-jdk11, 9.0-jdk11, 9-jdk11, jdk11, 9.0.37, 9.0, 9, latest
+Tags: 9.0.37-jdk11-openjdk-buster, 9.0-jdk11-openjdk-buster, 9-jdk11-openjdk-buster, jdk11-openjdk-buster, 9.0.37-jdk11-openjdk, 9.0-jdk11-openjdk, 9-jdk11-openjdk, jdk11-openjdk, 9.0.37-jdk11, 9.0-jdk11, 9-jdk11, jdk11, 9.0.37, 9.0, 9, latest
 Architectures: amd64, arm64v8
-GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
-Directory: 9.0/jdk11/openjdk
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 9.0/jdk11/openjdk-buster
 
-Tags: 9.0.37-jdk11-openjdk-slim, 9.0-jdk11-openjdk-slim, 9-jdk11-openjdk-slim, jdk11-openjdk-slim
+Tags: 9.0.37-jdk11-openjdk-slim-buster, 9.0-jdk11-openjdk-slim-buster, 9-jdk11-openjdk-slim-buster, jdk11-openjdk-slim-buster, 9.0.37-jdk11-openjdk-slim, 9.0-jdk11-openjdk-slim, 9-jdk11-openjdk-slim, jdk11-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
-Directory: 9.0/jdk11/openjdk-slim
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 9.0/jdk11/openjdk-slim-buster
 
 Tags: 9.0.37-jdk11-adoptopenjdk-hotspot, 9.0-jdk11-adoptopenjdk-hotspot, 9-jdk11-adoptopenjdk-hotspot, jdk11-adoptopenjdk-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -109,15 +109,15 @@ Architectures: amd64, arm64v8
 GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
 Directory: 9.0/jdk11/corretto
 
-Tags: 9.0.37-jdk8-openjdk, 9.0-jdk8-openjdk, 9-jdk8-openjdk, jdk8-openjdk, 9.0.37-jdk8, 9.0-jdk8, 9-jdk8, jdk8
+Tags: 9.0.37-jdk8-openjdk-buster, 9.0-jdk8-openjdk-buster, 9-jdk8-openjdk-buster, jdk8-openjdk-buster, 9.0.37-jdk8-openjdk, 9.0-jdk8-openjdk, 9-jdk8-openjdk, jdk8-openjdk, 9.0.37-jdk8, 9.0-jdk8, 9-jdk8, jdk8
 Architectures: amd64
-GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
-Directory: 9.0/jdk8/openjdk
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 9.0/jdk8/openjdk-buster
 
-Tags: 9.0.37-jdk8-openjdk-slim, 9.0-jdk8-openjdk-slim, 9-jdk8-openjdk-slim, jdk8-openjdk-slim
+Tags: 9.0.37-jdk8-openjdk-slim-buster, 9.0-jdk8-openjdk-slim-buster, 9-jdk8-openjdk-slim-buster, jdk8-openjdk-slim-buster, 9.0.37-jdk8-openjdk-slim, 9.0-jdk8-openjdk-slim, 9-jdk8-openjdk-slim, jdk8-openjdk-slim
 Architectures: amd64
-GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
-Directory: 9.0/jdk8/openjdk-slim
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 9.0/jdk8/openjdk-slim-buster
 
 Tags: 9.0.37-jdk8-adoptopenjdk-hotspot, 9.0-jdk8-adoptopenjdk-hotspot, 9-jdk8-adoptopenjdk-hotspot, jdk8-adoptopenjdk-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -134,30 +134,30 @@ Architectures: amd64, arm64v8
 GitCommit: c69707c90aead5fb901062271cdb5b1f134f8df1
 Directory: 9.0/jdk8/corretto
 
-Tags: 8.5.57-jdk14-openjdk-oracle, 8.5-jdk14-openjdk-oracle, 8-jdk14-openjdk-oracle
+Tags: 8.5.57-jdk14-openjdk-oraclelinux7, 8.5-jdk14-openjdk-oraclelinux7, 8-jdk14-openjdk-oraclelinux7, 8.5.57-jdk14-openjdk-oracle, 8.5-jdk14-openjdk-oracle, 8-jdk14-openjdk-oracle
 Architectures: amd64
-GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
-Directory: 8.5/jdk14/openjdk-oracle
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 8.5/jdk14/openjdk-oraclelinux7
 
-Tags: 8.5.57-jdk14-openjdk-buster, 8.5-jdk14-openjdk-buster, 8-jdk14-openjdk-buster
+Tags: 8.5.57-jdk14-openjdk-buster, 8.5-jdk14-openjdk-buster, 8-jdk14-openjdk-buster, 8.5.57-jdk14-openjdk, 8.5-jdk14-openjdk, 8-jdk14-openjdk, 8.5.57-jdk14, 8.5-jdk14, 8-jdk14
 Architectures: amd64
 GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
 Directory: 8.5/jdk14/openjdk-buster
 
-Tags: 8.5.57-jdk14-openjdk-slim-buster, 8.5-jdk14-openjdk-slim-buster, 8-jdk14-openjdk-slim-buster
+Tags: 8.5.57-jdk14-openjdk-slim-buster, 8.5-jdk14-openjdk-slim-buster, 8-jdk14-openjdk-slim-buster, 8.5.57-jdk14-openjdk-slim, 8.5-jdk14-openjdk-slim, 8-jdk14-openjdk-slim
 Architectures: amd64
 GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
 Directory: 8.5/jdk14/openjdk-slim-buster
 
-Tags: 8.5.57-jdk11-openjdk, 8.5-jdk11-openjdk, 8-jdk11-openjdk, 8.5.57-jdk11, 8.5-jdk11, 8-jdk11
+Tags: 8.5.57-jdk11-openjdk-buster, 8.5-jdk11-openjdk-buster, 8-jdk11-openjdk-buster, 8.5.57-jdk11-openjdk, 8.5-jdk11-openjdk, 8-jdk11-openjdk, 8.5.57-jdk11, 8.5-jdk11, 8-jdk11
 Architectures: amd64, arm64v8
-GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
-Directory: 8.5/jdk11/openjdk
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 8.5/jdk11/openjdk-buster
 
-Tags: 8.5.57-jdk11-openjdk-slim, 8.5-jdk11-openjdk-slim, 8-jdk11-openjdk-slim
+Tags: 8.5.57-jdk11-openjdk-slim-buster, 8.5-jdk11-openjdk-slim-buster, 8-jdk11-openjdk-slim-buster, 8.5.57-jdk11-openjdk-slim, 8.5-jdk11-openjdk-slim, 8-jdk11-openjdk-slim
 Architectures: amd64, arm64v8
-GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
-Directory: 8.5/jdk11/openjdk-slim
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 8.5/jdk11/openjdk-slim-buster
 
 Tags: 8.5.57-jdk11-adoptopenjdk-hotspot, 8.5-jdk11-adoptopenjdk-hotspot, 8-jdk11-adoptopenjdk-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -174,15 +174,15 @@ Architectures: amd64, arm64v8
 GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
 Directory: 8.5/jdk11/corretto
 
-Tags: 8.5.57-jdk8-openjdk, 8.5-jdk8-openjdk, 8-jdk8-openjdk, 8.5.57-jdk8, 8.5-jdk8, 8-jdk8, 8.5.57, 8.5, 8
+Tags: 8.5.57-jdk8-openjdk-buster, 8.5-jdk8-openjdk-buster, 8-jdk8-openjdk-buster, 8.5.57-jdk8-openjdk, 8.5-jdk8-openjdk, 8-jdk8-openjdk, 8.5.57-jdk8, 8.5-jdk8, 8-jdk8, 8.5.57, 8.5, 8
 Architectures: amd64
-GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
-Directory: 8.5/jdk8/openjdk
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 8.5/jdk8/openjdk-buster
 
-Tags: 8.5.57-jdk8-openjdk-slim, 8.5-jdk8-openjdk-slim, 8-jdk8-openjdk-slim
+Tags: 8.5.57-jdk8-openjdk-slim-buster, 8.5-jdk8-openjdk-slim-buster, 8-jdk8-openjdk-slim-buster, 8.5.57-jdk8-openjdk-slim, 8.5-jdk8-openjdk-slim, 8-jdk8-openjdk-slim
 Architectures: amd64
-GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
-Directory: 8.5/jdk8/openjdk-slim
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 8.5/jdk8/openjdk-slim-buster
 
 Tags: 8.5.57-jdk8-adoptopenjdk-hotspot, 8.5-jdk8-adoptopenjdk-hotspot, 8-jdk8-adoptopenjdk-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
@@ -199,15 +199,15 @@ Architectures: amd64, arm64v8
 GitCommit: 22269be2cf23e1f7b17331a90db4f4ed9c9d1f65
 Directory: 8.5/jdk8/corretto
 
-Tags: 7.0.105-jdk8-openjdk, 7.0-jdk8-openjdk, 7-jdk8-openjdk, 7.0.105-jdk8, 7.0-jdk8, 7-jdk8, 7.0.105, 7.0, 7
+Tags: 7.0.105-jdk8-openjdk-buster, 7.0-jdk8-openjdk-buster, 7-jdk8-openjdk-buster, 7.0.105-jdk8-openjdk, 7.0-jdk8-openjdk, 7-jdk8-openjdk, 7.0.105-jdk8, 7.0-jdk8, 7-jdk8, 7.0.105, 7.0, 7
 Architectures: amd64
-GitCommit: 44d5a8ba6e7b85fd4d038e063456c1ae5d6a797a
-Directory: 7/jdk8/openjdk
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 7/jdk8/openjdk-buster
 
-Tags: 7.0.105-jdk8-openjdk-slim, 7.0-jdk8-openjdk-slim, 7-jdk8-openjdk-slim
+Tags: 7.0.105-jdk8-openjdk-slim-buster, 7.0-jdk8-openjdk-slim-buster, 7-jdk8-openjdk-slim-buster, 7.0.105-jdk8-openjdk-slim, 7.0-jdk8-openjdk-slim, 7-jdk8-openjdk-slim
 Architectures: amd64
-GitCommit: 44d5a8ba6e7b85fd4d038e063456c1ae5d6a797a
-Directory: 7/jdk8/openjdk-slim
+GitCommit: 20a00bb175913f9597ba3831bacbe99d2a470403
+Directory: 7/jdk8/openjdk-slim-buster
 
 Tags: 7.0.105-jdk8-adoptopenjdk-hotspot, 7.0-jdk8-adoptopenjdk-hotspot, 7-jdk8-adoptopenjdk-hotspot
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x