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

Merged
merged 1 commit into from
Apr 1, 2024
Merged

Update tomcat #16518

merged 1 commit into from
Apr 1, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Apr 1, 2024

Changes:

Changes:

- docker-library/tomcat@5d26be5: Merge pull request docker-library/tomcat#310 from infosiftr/eol-8.5
- docker-library/tomcat@9c41f1c: Update templates for 8.x EOL
- docker-library/tomcat@9cc80d7: Remove EOL 8.5 series
@tianon tianon requested a review from a team as a code owner April 1, 2024 21:24
Copy link

github-actions bot commented Apr 1, 2024

Diff for 5e947eb:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 147671d..0739a59 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,96 +1,6 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/tomcat.git
 
-Tags: 8.5.100-jdk8-corretto-al2, 8.5-jdk8-corretto-al2, 8-jdk8-corretto-al2, 8.5.100-jdk8-corretto, 8.5-jdk8-corretto, 8-jdk8-corretto
-Architectures: amd64, arm64v8
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk8/corretto-al2
-
-Tags: 8.5.100-jdk8-temurin-focal, 8.5-jdk8-temurin-focal, 8-jdk8-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk8/temurin-focal
-
-Tags: 8.5.100-jdk8-temurin-jammy, 8.5-jdk8-temurin-jammy, 8-jdk8-temurin-jammy, 8.5.100-jdk8-temurin, 8.5-jdk8-temurin, 8-jdk8-temurin, 8.5.100-jdk8, 8.5-jdk8, 8-jdk8
-Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk8/temurin-jammy
-
-Tags: 8.5.100-jdk11-corretto-al2, 8.5-jdk11-corretto-al2, 8-jdk11-corretto-al2, 8.5.100-jdk11-corretto, 8.5-jdk11-corretto, 8-jdk11-corretto
-Architectures: amd64, arm64v8
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk11/corretto-al2
-
-Tags: 8.5.100-jdk11-temurin-focal, 8.5-jdk11-temurin-focal, 8-jdk11-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk11/temurin-focal
-
-Tags: 8.5.100-jdk11-temurin-jammy, 8.5-jdk11-temurin-jammy, 8-jdk11-temurin-jammy, 8.5.100-jdk11-temurin, 8.5-jdk11-temurin, 8-jdk11-temurin, 8.5.100-jdk11, 8.5-jdk11, 8-jdk11
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk11/temurin-jammy
-
-Tags: 8.5.100-jdk17-corretto-al2, 8.5-jdk17-corretto-al2, 8-jdk17-corretto-al2, 8.5.100-jdk17-corretto, 8.5-jdk17-corretto, 8-jdk17-corretto
-Architectures: amd64, arm64v8
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk17/corretto-al2
-
-Tags: 8.5.100-jdk17-temurin-focal, 8.5-jdk17-temurin-focal, 8-jdk17-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk17/temurin-focal
-
-Tags: 8.5.100-jdk17-temurin-jammy, 8.5-jdk17-temurin-jammy, 8-jdk17-temurin-jammy, 8.5.100-jdk17-temurin, 8.5-jdk17-temurin, 8-jdk17-temurin, 8.5.100-jdk17, 8.5-jdk17, 8-jdk17
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk17/temurin-jammy
-
-Tags: 8.5.100-jdk21-corretto-al2, 8.5-jdk21-corretto-al2, 8-jdk21-corretto-al2, 8.5.100-jdk21-corretto, 8.5-jdk21-corretto, 8-jdk21-corretto
-Architectures: amd64, arm64v8
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk21/corretto-al2
-
-Tags: 8.5.100-jdk21-temurin-jammy, 8.5-jdk21-temurin-jammy, 8-jdk21-temurin-jammy, 8.5.100-jdk21-temurin, 8.5-jdk21-temurin, 8-jdk21-temurin, 8.5.100-jdk21, 8.5-jdk21, 8-jdk21, 8.5.100, 8.5, 8
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jdk21/temurin-jammy
-
-Tags: 8.5.100-jre8-temurin-focal, 8.5-jre8-temurin-focal, 8-jre8-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jre8/temurin-focal
-
-Tags: 8.5.100-jre8-temurin-jammy, 8.5-jre8-temurin-jammy, 8-jre8-temurin-jammy, 8.5.100-jre8-temurin, 8.5-jre8-temurin, 8-jre8-temurin, 8.5.100-jre8, 8.5-jre8, 8-jre8
-Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jre8/temurin-jammy
-
-Tags: 8.5.100-jre11-temurin-focal, 8.5-jre11-temurin-focal, 8-jre11-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jre11/temurin-focal
-
-Tags: 8.5.100-jre11-temurin-jammy, 8.5-jre11-temurin-jammy, 8-jre11-temurin-jammy, 8.5.100-jre11-temurin, 8.5-jre11-temurin, 8-jre11-temurin, 8.5.100-jre11, 8.5-jre11, 8-jre11
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jre11/temurin-jammy
-
-Tags: 8.5.100-jre17-temurin-focal, 8.5-jre17-temurin-focal, 8-jre17-temurin-focal
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jre17/temurin-focal
-
-Tags: 8.5.100-jre17-temurin-jammy, 8.5-jre17-temurin-jammy, 8-jre17-temurin-jammy, 8.5.100-jre17-temurin, 8.5-jre17-temurin, 8-jre17-temurin, 8.5.100-jre17, 8.5-jre17, 8-jre17
-Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jre17/temurin-jammy
-
-Tags: 8.5.100-jre21-temurin-jammy, 8.5-jre21-temurin-jammy, 8-jre21-temurin-jammy, 8.5.100-jre21-temurin, 8.5-jre21-temurin, 8-jre21-temurin, 8.5.100-jre21, 8.5-jre21, 8-jre21
-Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1ef6e6cdda8fa813367d1fb924f48cfb8aa138de
-Directory: 8.5/jre21/temurin-jammy
-
 Tags: 9.0.87-jdk8-corretto-al2, 9.0-jdk8-corretto-al2, 9-jdk8-corretto-al2, 9.0.87-jdk8-corretto, 9.0-jdk8-corretto, 9-jdk8-corretto
 Architectures: amd64, arm64v8
 GitCommit: 3ca04782a5cc623bda70cd002ec9577f7ae7b1b9
diff --git a/_bashbrew-list b/_bashbrew-list
index f5d12ab..7ce303b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,120 +1,3 @@
-tomcat:8
-tomcat:8-jdk8
-tomcat:8-jdk8-corretto
-tomcat:8-jdk8-corretto-al2
-tomcat:8-jdk8-temurin
-tomcat:8-jdk8-temurin-focal
-tomcat:8-jdk8-temurin-jammy
-tomcat:8-jdk11
-tomcat:8-jdk11-corretto
-tomcat:8-jdk11-corretto-al2
-tomcat:8-jdk11-temurin
-tomcat:8-jdk11-temurin-focal
-tomcat:8-jdk11-temurin-jammy
-tomcat:8-jdk17
-tomcat:8-jdk17-corretto
-tomcat:8-jdk17-corretto-al2
-tomcat:8-jdk17-temurin
-tomcat:8-jdk17-temurin-focal
-tomcat:8-jdk17-temurin-jammy
-tomcat:8-jdk21
-tomcat:8-jdk21-corretto
-tomcat:8-jdk21-corretto-al2
-tomcat:8-jdk21-temurin
-tomcat:8-jdk21-temurin-jammy
-tomcat:8-jre8
-tomcat:8-jre8-temurin
-tomcat:8-jre8-temurin-focal
-tomcat:8-jre8-temurin-jammy
-tomcat:8-jre11
-tomcat:8-jre11-temurin
-tomcat:8-jre11-temurin-focal
-tomcat:8-jre11-temurin-jammy
-tomcat:8-jre17
-tomcat:8-jre17-temurin
-tomcat:8-jre17-temurin-focal
-tomcat:8-jre17-temurin-jammy
-tomcat:8-jre21
-tomcat:8-jre21-temurin
-tomcat:8-jre21-temurin-jammy
-tomcat:8.5
-tomcat:8.5-jdk8
-tomcat:8.5-jdk8-corretto
-tomcat:8.5-jdk8-corretto-al2
-tomcat:8.5-jdk8-temurin
-tomcat:8.5-jdk8-temurin-focal
-tomcat:8.5-jdk8-temurin-jammy
-tomcat:8.5-jdk11
-tomcat:8.5-jdk11-corretto
-tomcat:8.5-jdk11-corretto-al2
-tomcat:8.5-jdk11-temurin
-tomcat:8.5-jdk11-temurin-focal
-tomcat:8.5-jdk11-temurin-jammy
-tomcat:8.5-jdk17
-tomcat:8.5-jdk17-corretto
-tomcat:8.5-jdk17-corretto-al2
-tomcat:8.5-jdk17-temurin
-tomcat:8.5-jdk17-temurin-focal
-tomcat:8.5-jdk17-temurin-jammy
-tomcat:8.5-jdk21
-tomcat:8.5-jdk21-corretto
-tomcat:8.5-jdk21-corretto-al2
-tomcat:8.5-jdk21-temurin
-tomcat:8.5-jdk21-temurin-jammy
-tomcat:8.5-jre8
-tomcat:8.5-jre8-temurin
-tomcat:8.5-jre8-temurin-focal
-tomcat:8.5-jre8-temurin-jammy
-tomcat:8.5-jre11
-tomcat:8.5-jre11-temurin
-tomcat:8.5-jre11-temurin-focal
-tomcat:8.5-jre11-temurin-jammy
-tomcat:8.5-jre17
-tomcat:8.5-jre17-temurin
-tomcat:8.5-jre17-temurin-focal
-tomcat:8.5-jre17-temurin-jammy
-tomcat:8.5-jre21
-tomcat:8.5-jre21-temurin
-tomcat:8.5-jre21-temurin-jammy
-tomcat:8.5.100
-tomcat:8.5.100-jdk8
-tomcat:8.5.100-jdk8-corretto
-tomcat:8.5.100-jdk8-corretto-al2
-tomcat:8.5.100-jdk8-temurin
-tomcat:8.5.100-jdk8-temurin-focal
-tomcat:8.5.100-jdk8-temurin-jammy
-tomcat:8.5.100-jdk11
-tomcat:8.5.100-jdk11-corretto
-tomcat:8.5.100-jdk11-corretto-al2
-tomcat:8.5.100-jdk11-temurin
-tomcat:8.5.100-jdk11-temurin-focal
-tomcat:8.5.100-jdk11-temurin-jammy
-tomcat:8.5.100-jdk17
-tomcat:8.5.100-jdk17-corretto
-tomcat:8.5.100-jdk17-corretto-al2
-tomcat:8.5.100-jdk17-temurin
-tomcat:8.5.100-jdk17-temurin-focal
-tomcat:8.5.100-jdk17-temurin-jammy
-tomcat:8.5.100-jdk21
-tomcat:8.5.100-jdk21-corretto
-tomcat:8.5.100-jdk21-corretto-al2
-tomcat:8.5.100-jdk21-temurin
-tomcat:8.5.100-jdk21-temurin-jammy
-tomcat:8.5.100-jre8
-tomcat:8.5.100-jre8-temurin
-tomcat:8.5.100-jre8-temurin-focal
-tomcat:8.5.100-jre8-temurin-jammy
-tomcat:8.5.100-jre11
-tomcat:8.5.100-jre11-temurin
-tomcat:8.5.100-jre11-temurin-focal
-tomcat:8.5.100-jre11-temurin-jammy
-tomcat:8.5.100-jre17
-tomcat:8.5.100-jre17-temurin
-tomcat:8.5.100-jre17-temurin-focal
-tomcat:8.5.100-jre17-temurin-jammy
-tomcat:8.5.100-jre21
-tomcat:8.5.100-jre21-temurin
-tomcat:8.5.100-jre21-temurin-jammy
 tomcat:9
 tomcat:9-jdk8
 tomcat:9-jdk8-corretto
diff --git a/tomcat_8-jdk11-corretto/Dockerfile b/tomcat_8-jdk11-corretto/Dockerfile
deleted file mode 100644
index 16af97d..0000000
diff --git a/tomcat_8-jdk11-temurin-focal/Dockerfile b/tomcat_8-jdk11-temurin-focal/Dockerfile
deleted file mode 100644
index 590309c..0000000
diff --git a/tomcat_8-jdk11/Dockerfile b/tomcat_8-jdk11/Dockerfile
deleted file mode 100644
index 7f7be21..0000000
diff --git a/tomcat_8-jdk17-corretto/Dockerfile b/tomcat_8-jdk17-corretto/Dockerfile
deleted file mode 100644
index 91e1a7a..0000000
diff --git a/tomcat_8-jdk17-temurin-focal/Dockerfile b/tomcat_8-jdk17-temurin-focal/Dockerfile
deleted file mode 100644
index c06a1ad..0000000
diff --git a/tomcat_8-jdk17/Dockerfile b/tomcat_8-jdk17/Dockerfile
deleted file mode 100644
index 9cf7b53..0000000
diff --git a/tomcat_8-jdk21-corretto/Dockerfile b/tomcat_8-jdk21-corretto/Dockerfile
deleted file mode 100644
index 649f8da..0000000
diff --git a/tomcat_8-jdk8-corretto/Dockerfile b/tomcat_8-jdk8-corretto/Dockerfile
deleted file mode 100644
index 884c448..0000000
diff --git a/tomcat_8-jdk8-temurin-focal/Dockerfile b/tomcat_8-jdk8-temurin-focal/Dockerfile
deleted file mode 100644
index bfae84a..0000000
diff --git a/tomcat_8-jdk8/Dockerfile b/tomcat_8-jdk8/Dockerfile
deleted file mode 100644
index 131fb0a..0000000
diff --git a/tomcat_8-jre11-temurin-focal/Dockerfile b/tomcat_8-jre11-temurin-focal/Dockerfile
deleted file mode 100644
index ce45b31..0000000
diff --git a/tomcat_8-jre11/Dockerfile b/tomcat_8-jre11/Dockerfile
deleted file mode 100644
index 6dc9b57..0000000
diff --git a/tomcat_8-jre17-temurin-focal/Dockerfile b/tomcat_8-jre17-temurin-focal/Dockerfile
deleted file mode 100644
index 2701abf..0000000
diff --git a/tomcat_8-jre17/Dockerfile b/tomcat_8-jre17/Dockerfile
deleted file mode 100644
index b34537c..0000000
diff --git a/tomcat_8-jre21/Dockerfile b/tomcat_8-jre21/Dockerfile
deleted file mode 100644
index c21fe0c..0000000
diff --git a/tomcat_8-jre8-temurin-focal/Dockerfile b/tomcat_8-jre8-temurin-focal/Dockerfile
deleted file mode 100644
index 30f77d4..0000000
diff --git a/tomcat_8-jre8/Dockerfile b/tomcat_8-jre8/Dockerfile
deleted file mode 100644
index 79438f0..0000000
diff --git a/tomcat_8/Dockerfile b/tomcat_8/Dockerfile
deleted file mode 100644
index 158b7b2..0000000

Relevant Maintainers:

@yosifkit yosifkit merged commit 0cd95c0 into docker-library:master Apr 1, 2024
20 checks passed
@yosifkit yosifkit deleted the tomcat branch April 1, 2024 23:32
@yosifkit
Copy link
Member

yosifkit commented Apr 1, 2024

FYI affected maintainers for the tomcat:8.5* EOL/removal:

Please either drop the affected tags from the supported list (by removing them from your library/ file) or update them to a supported release.

(Also, if you're not supposed to be in this list, or you're getting this forwarded to you and you are supposed to be in this list, please update the Maintainers: section of the relevant library/ file appropriately! 😅)

juanluisrp added a commit to geonetwork/docker-geonetwork that referenced this pull request Apr 2, 2024
Tomcat 8.5 reached end-of-live on 2024-03-31 and the upstream Tomcat
official docker image will not be updated anymore. To keep maintaining
the GeoNetwork 3.12 image in the official repo Docker team has asked to
update Tomcat or to remove the version from the list. We are updating
to Tomcat 9.

docker-library/official-images#16518
juanluisrp added a commit to geonetwork/docker-geonetwork that referenced this pull request Apr 2, 2024
Tomcat 8.5 reached end-of-live on 2024-03-31 and the upstream Tomcat
official docker image will not be updated anymore. To keep maintaining
the GeoNetwork 3.12 image in the official repo Docker team has asked to
update Tomcat or to remove the version from the list. We are updating
to Tomcat 9.

docker-library/official-images#16518
juanluisrp added a commit to GeoCat/official-images that referenced this pull request Apr 2, 2024
Tomcat 8.5 reached end-of-live on 2024-03-31 and the upstream Tomcat
official docker image will not be updated anymore. To keep maintaining
the GeoNetwork 3.12 image in the official repo Docker team has asked to
update Tomcat or to remove the version from the list. We are updating
to Tomcat 9.

docker-library#16518
juanluisrp added a commit to geonetwork/docker-geonetwork that referenced this pull request Apr 2, 2024
Tomcat 8.5 reached end-of-live on 2024-03-31 and the upstream Tomcat
official docker image will not be updated anymore. To keep maintaining
the GeoNetwork 3.12 image in the official repo Docker team has asked to
update Tomcat or to remove the version from the list. We are updating
to Tomcat 9.

docker-library/official-images#16518
juanluisrp added a commit to GeoCat/official-images that referenced this pull request Apr 2, 2024
Tomcat 8.5 reached end-of-live on 2024-03-31 and the upstream Tomcat
official docker image will not be updated anymore. To keep maintaining
the GeoNetwork 3.12 image in the official repo Docker team has asked to
update Tomcat or to remove the version from the list. We are updating
to Tomcat 9.

docker-library#16518
martin-g pushed a commit to martin-g/docker-official-images that referenced this pull request Apr 3, 2024
Tomcat 8.5 reached end-of-live on 2024-03-31 and the upstream Tomcat
official docker image will not be updated anymore. To keep maintaining
the GeoNetwork 3.12 image in the official repo Docker team has asked to
update Tomcat or to remove the version from the list. We are updating
to Tomcat 9.

docker-library#16518
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