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

Merged
merged 1 commit into from
Aug 11, 2023
Merged

Update tomcat #15186

merged 1 commit into from
Aug 11, 2023

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/tomcat@18d7f71: Merge pull request docker-library/tomcat#303 from infosiftr/fix-77-again
- docker-library/tomcat@55546d6: Skip upstream openjdk entrypoint
@github-actions
Copy link

Diff for cb98546:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4d00a33..f988f99 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,12 +8,12 @@ Directory: 8.5/jdk8/corretto-al2
 
 Tags: 8.5.91-jdk8-temurin-focal, 8.5-jdk8-temurin-focal, 8-jdk8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jdk8/temurin-focal
 
 Tags: 8.5.91-jdk8-temurin-jammy, 8.5-jdk8-temurin-jammy, 8-jdk8-temurin-jammy, 8.5.91-jdk8-temurin, 8.5-jdk8-temurin, 8-jdk8-temurin, 8.5.91-jdk8, 8.5-jdk8, 8-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jdk8/temurin-jammy
 
 Tags: 8.5.91-jdk11-corretto-al2, 8.5-jdk11-corretto-al2, 8-jdk11-corretto-al2, 8.5.91-jdk11-corretto, 8.5-jdk11-corretto, 8-jdk11-corretto
@@ -23,12 +23,12 @@ Directory: 8.5/jdk11/corretto-al2
 
 Tags: 8.5.91-jdk11-temurin-focal, 8.5-jdk11-temurin-focal, 8-jdk11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jdk11/temurin-focal
 
 Tags: 8.5.91-jdk11-temurin-jammy, 8.5-jdk11-temurin-jammy, 8-jdk11-temurin-jammy, 8.5.91-jdk11-temurin, 8.5-jdk11-temurin, 8-jdk11-temurin, 8.5.91-jdk11, 8.5-jdk11, 8-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jdk11/temurin-jammy
 
 Tags: 8.5.91-jdk17-corretto-al2, 8.5-jdk17-corretto-al2, 8-jdk17-corretto-al2, 8.5.91-jdk17-corretto, 8.5-jdk17-corretto, 8-jdk17-corretto
@@ -38,12 +38,12 @@ Directory: 8.5/jdk17/corretto-al2
 
 Tags: 8.5.91-jdk17-temurin-focal, 8.5-jdk17-temurin-focal, 8-jdk17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jdk17/temurin-focal
 
 Tags: 8.5.91-jdk17-temurin-jammy, 8.5-jdk17-temurin-jammy, 8-jdk17-temurin-jammy, 8.5.91-jdk17-temurin, 8.5-jdk17-temurin, 8-jdk17-temurin, 8.5.91-jdk17, 8.5-jdk17, 8-jdk17, 8.5.91, 8.5, 8
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jdk17/temurin-jammy
 
 Tags: 8.5.91-jdk21-openjdk-bookworm, 8.5-jdk21-openjdk-bookworm, 8-jdk21-openjdk-bookworm, 8.5.91-jdk21-openjdk, 8.5-jdk21-openjdk, 8-jdk21-openjdk
@@ -68,32 +68,32 @@ Directory: 8.5/jdk21/openjdk-slim-bullseye
 
 Tags: 8.5.91-jre8-temurin-focal, 8.5-jre8-temurin-focal, 8-jre8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jre8/temurin-focal
 
 Tags: 8.5.91-jre8-temurin-jammy, 8.5-jre8-temurin-jammy, 8-jre8-temurin-jammy, 8.5.91-jre8-temurin, 8.5-jre8-temurin, 8-jre8-temurin, 8.5.91-jre8, 8.5-jre8, 8-jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jre8/temurin-jammy
 
 Tags: 8.5.91-jre11-temurin-focal, 8.5-jre11-temurin-focal, 8-jre11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jre11/temurin-focal
 
 Tags: 8.5.91-jre11-temurin-jammy, 8.5-jre11-temurin-jammy, 8-jre11-temurin-jammy, 8.5.91-jre11-temurin, 8.5-jre11-temurin, 8-jre11-temurin, 8.5.91-jre11, 8.5-jre11, 8-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jre11/temurin-jammy
 
 Tags: 8.5.91-jre17-temurin-focal, 8.5-jre17-temurin-focal, 8-jre17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jre17/temurin-focal
 
 Tags: 8.5.91-jre17-temurin-jammy, 8.5-jre17-temurin-jammy, 8-jre17-temurin-jammy, 8.5.91-jre17-temurin, 8.5-jre17-temurin, 8-jre17-temurin, 8.5.91-jre17, 8.5-jre17, 8-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: c0878b79965ebabcc024caf7c5ad1aa4ff0f0d71
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 8.5/jre17/temurin-jammy
 
 Tags: 9.0.78-jdk8-corretto-al2, 9.0-jdk8-corretto-al2, 9-jdk8-corretto-al2, 9.0.78-jdk8-corretto, 9.0-jdk8-corretto, 9-jdk8-corretto
@@ -103,12 +103,12 @@ Directory: 9.0/jdk8/corretto-al2
 
 Tags: 9.0.78-jdk8-temurin-focal, 9.0-jdk8-temurin-focal, 9-jdk8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jdk8/temurin-focal
 
 Tags: 9.0.78-jdk8-temurin-jammy, 9.0-jdk8-temurin-jammy, 9-jdk8-temurin-jammy, 9.0.78-jdk8-temurin, 9.0-jdk8-temurin, 9-jdk8-temurin, 9.0.78-jdk8, 9.0-jdk8, 9-jdk8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jdk8/temurin-jammy
 
 Tags: 9.0.78-jdk11-corretto-al2, 9.0-jdk11-corretto-al2, 9-jdk11-corretto-al2, 9.0.78-jdk11-corretto, 9.0-jdk11-corretto, 9-jdk11-corretto
@@ -118,12 +118,12 @@ Directory: 9.0/jdk11/corretto-al2
 
 Tags: 9.0.78-jdk11-temurin-focal, 9.0-jdk11-temurin-focal, 9-jdk11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jdk11/temurin-focal
 
 Tags: 9.0.78-jdk11-temurin-jammy, 9.0-jdk11-temurin-jammy, 9-jdk11-temurin-jammy, 9.0.78-jdk11-temurin, 9.0-jdk11-temurin, 9-jdk11-temurin, 9.0.78-jdk11, 9.0-jdk11, 9-jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jdk11/temurin-jammy
 
 Tags: 9.0.78-jdk17-corretto-al2, 9.0-jdk17-corretto-al2, 9-jdk17-corretto-al2, 9.0.78-jdk17-corretto, 9.0-jdk17-corretto, 9-jdk17-corretto
@@ -133,12 +133,12 @@ Directory: 9.0/jdk17/corretto-al2
 
 Tags: 9.0.78-jdk17-temurin-focal, 9.0-jdk17-temurin-focal, 9-jdk17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jdk17/temurin-focal
 
 Tags: 9.0.78-jdk17-temurin-jammy, 9.0-jdk17-temurin-jammy, 9-jdk17-temurin-jammy, 9.0.78-jdk17-temurin, 9.0-jdk17-temurin, 9-jdk17-temurin, 9.0.78-jdk17, 9.0-jdk17, 9-jdk17, 9.0.78, 9.0, 9
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jdk17/temurin-jammy
 
 Tags: 9.0.78-jdk21-openjdk-bookworm, 9.0-jdk21-openjdk-bookworm, 9-jdk21-openjdk-bookworm, 9.0.78-jdk21-openjdk, 9.0-jdk21-openjdk, 9-jdk21-openjdk
@@ -163,42 +163,42 @@ Directory: 9.0/jdk21/openjdk-slim-bullseye
 
 Tags: 9.0.78-jre8-temurin-focal, 9.0-jre8-temurin-focal, 9-jre8-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jre8/temurin-focal
 
 Tags: 9.0.78-jre8-temurin-jammy, 9.0-jre8-temurin-jammy, 9-jre8-temurin-jammy, 9.0.78-jre8-temurin, 9.0-jre8-temurin, 9-jre8-temurin, 9.0.78-jre8, 9.0-jre8, 9-jre8
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jre8/temurin-jammy
 
 Tags: 9.0.78-jre11-temurin-focal, 9.0-jre11-temurin-focal, 9-jre11-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jre11/temurin-focal
 
 Tags: 9.0.78-jre11-temurin-jammy, 9.0-jre11-temurin-jammy, 9-jre11-temurin-jammy, 9.0.78-jre11-temurin, 9.0-jre11-temurin, 9-jre11-temurin, 9.0.78-jre11, 9.0-jre11, 9-jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jre11/temurin-jammy
 
 Tags: 9.0.78-jre17-temurin-focal, 9.0-jre17-temurin-focal, 9-jre17-temurin-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jre17/temurin-focal
 
 Tags: 9.0.78-jre17-temurin-jammy, 9.0-jre17-temurin-jammy, 9-jre17-temurin-jammy, 9.0.78-jre17-temurin, 9.0-jre17-temurin, 9-jre17-temurin, 9.0.78-jre17, 9.0-jre17, 9-jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 3459209f05672beaab5e3fd3349c6477428e7ac6
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 9.0/jre17/temurin-jammy
 
 Tags: 10.1.11-jdk11-temurin-jammy, 10.1-jdk11-temurin-jammy, 10-jdk11-temurin-jammy, jdk11-temurin-jammy, 10.1.11-jdk11-temurin, 10.1-jdk11-temurin, 10-jdk11-temurin, jdk11-temurin, 10.1.11-jdk11, 10.1-jdk11, 10-jdk11, jdk11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e4258d73d56873d026df65bdb76cc01376c3a203
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 10.1/jdk11/temurin-jammy
 
 Tags: 10.1.11-jdk17-temurin-jammy, 10.1-jdk17-temurin-jammy, 10-jdk17-temurin-jammy, jdk17-temurin-jammy, 10.1.11-jdk17-temurin, 10.1-jdk17-temurin, 10-jdk17-temurin, jdk17-temurin, 10.1.11-jdk17, 10.1-jdk17, 10-jdk17, jdk17, 10.1.11, 10.1, 10, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e4258d73d56873d026df65bdb76cc01376c3a203
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 10.1/jdk17/temurin-jammy
 
 Tags: 10.1.11-jdk21-openjdk-bookworm, 10.1-jdk21-openjdk-bookworm, 10-jdk21-openjdk-bookworm, jdk21-openjdk-bookworm, 10.1.11-jdk21-openjdk, 10.1-jdk21-openjdk, 10-jdk21-openjdk, jdk21-openjdk
@@ -213,12 +213,12 @@ Directory: 10.1/jdk21/openjdk-slim-bookworm
 
 Tags: 10.1.11-jre11-temurin-jammy, 10.1-jre11-temurin-jammy, 10-jre11-temurin-jammy, jre11-temurin-jammy, 10.1.11-jre11-temurin, 10.1-jre11-temurin, 10-jre11-temurin, jre11-temurin, 10.1.11-jre11, 10.1-jre11, 10-jre11, jre11
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e4258d73d56873d026df65bdb76cc01376c3a203
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 10.1/jre11/temurin-jammy
 
 Tags: 10.1.11-jre17-temurin-jammy, 10.1-jre17-temurin-jammy, 10-jre17-temurin-jammy, jre17-temurin-jammy, 10.1.11-jre17-temurin, 10.1-jre17-temurin, 10-jre17-temurin, jre17-temurin, 10.1.11-jre17, 10.1-jre17, 10-jre17, jre17
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e4258d73d56873d026df65bdb76cc01376c3a203
+GitCommit: 55546d611e41cde189ba9e820c25cb5bf18a33f9
 Directory: 10.1/jre17/temurin-jammy
 
 Tags: 11.0.0-M9-jdk21-openjdk-bookworm, 11.0.0-jdk21-openjdk-bookworm, 11.0-jdk21-openjdk-bookworm, 11.0.0-M9-jdk21-openjdk, 11.0.0-jdk21-openjdk, 11.0-jdk21-openjdk
diff --git a/tomcat_8-jdk11-temurin-focal/Dockerfile b/tomcat_8-jdk11-temurin-focal/Dockerfile
index fcdbf6c..03d0586 100644
--- a/tomcat_8-jdk11-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk11-temurin-focal/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jdk11/Dockerfile b/tomcat_8-jdk11/Dockerfile
index 013ae7e..4484e3d 100644
--- a/tomcat_8-jdk11/Dockerfile
+++ b/tomcat_8-jdk11/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jdk17-temurin-focal/Dockerfile b/tomcat_8-jdk17-temurin-focal/Dockerfile
index 342d635..f254239 100644
--- a/tomcat_8-jdk17-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk17-temurin-focal/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jdk8-temurin-focal/Dockerfile b/tomcat_8-jdk8-temurin-focal/Dockerfile
index c024b5d..ec4c1e3 100644
--- a/tomcat_8-jdk8-temurin-focal/Dockerfile
+++ b/tomcat_8-jdk8-temurin-focal/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jdk8/Dockerfile b/tomcat_8-jdk8/Dockerfile
index 458e3aa..ae968a0 100644
--- a/tomcat_8-jdk8/Dockerfile
+++ b/tomcat_8-jdk8/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jre11-temurin-focal/Dockerfile b/tomcat_8-jre11-temurin-focal/Dockerfile
index ddc45cb..6bb43df 100644
--- a/tomcat_8-jre11-temurin-focal/Dockerfile
+++ b/tomcat_8-jre11-temurin-focal/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jre11/Dockerfile b/tomcat_8-jre11/Dockerfile
index 21f309f..383cdb9 100644
--- a/tomcat_8-jre11/Dockerfile
+++ b/tomcat_8-jre11/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jre17-temurin-focal/Dockerfile b/tomcat_8-jre17-temurin-focal/Dockerfile
index c17e8dc..2509bae 100644
--- a/tomcat_8-jre17-temurin-focal/Dockerfile
+++ b/tomcat_8-jre17-temurin-focal/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jre17/Dockerfile b/tomcat_8-jre17/Dockerfile
index 9e6d30d..0e8d502 100644
--- a/tomcat_8-jre17/Dockerfile
+++ b/tomcat_8-jre17/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jre8-temurin-focal/Dockerfile b/tomcat_8-jre8-temurin-focal/Dockerfile
index ebdd314..b4b3a4d 100644
--- a/tomcat_8-jre8-temurin-focal/Dockerfile
+++ b/tomcat_8-jre8-temurin-focal/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8-jre8/Dockerfile b/tomcat_8-jre8/Dockerfile
index b47fab8..1b9784b 100644
--- a/tomcat_8-jre8/Dockerfile
+++ b/tomcat_8-jre8/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_8/Dockerfile b/tomcat_8/Dockerfile
index 7a0c343..ef8065f 100644
--- a/tomcat_8/Dockerfile
+++ b/tomcat_8/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jdk11-temurin-focal/Dockerfile b/tomcat_9-jdk11-temurin-focal/Dockerfile
index edfd312..96b9614 100644
--- a/tomcat_9-jdk11-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk11-temurin-focal/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jdk11/Dockerfile b/tomcat_9-jdk11/Dockerfile
index 7d808fa..3455611 100644
--- a/tomcat_9-jdk11/Dockerfile
+++ b/tomcat_9-jdk11/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jdk17-temurin-focal/Dockerfile b/tomcat_9-jdk17-temurin-focal/Dockerfile
index d92c876..fb9e479 100644
--- a/tomcat_9-jdk17-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk17-temurin-focal/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jdk8-temurin-focal/Dockerfile b/tomcat_9-jdk8-temurin-focal/Dockerfile
index 59da052..35a90b4 100644
--- a/tomcat_9-jdk8-temurin-focal/Dockerfile
+++ b/tomcat_9-jdk8-temurin-focal/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jdk8/Dockerfile b/tomcat_9-jdk8/Dockerfile
index 8387903..24c34a7 100644
--- a/tomcat_9-jdk8/Dockerfile
+++ b/tomcat_9-jdk8/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jre11-temurin-focal/Dockerfile b/tomcat_9-jre11-temurin-focal/Dockerfile
index 215cf5c..d0e9eb6 100644
--- a/tomcat_9-jre11-temurin-focal/Dockerfile
+++ b/tomcat_9-jre11-temurin-focal/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jre11/Dockerfile b/tomcat_9-jre11/Dockerfile
index d97e737..a34590c 100644
--- a/tomcat_9-jre11/Dockerfile
+++ b/tomcat_9-jre11/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jre17-temurin-focal/Dockerfile b/tomcat_9-jre17-temurin-focal/Dockerfile
index 4c9051c..d261f1b 100644
--- a/tomcat_9-jre17-temurin-focal/Dockerfile
+++ b/tomcat_9-jre17-temurin-focal/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jre17/Dockerfile b/tomcat_9-jre17/Dockerfile
index 4bb651b..6be65a6 100644
--- a/tomcat_9-jre17/Dockerfile
+++ b/tomcat_9-jre17/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jre8-temurin-focal/Dockerfile b/tomcat_9-jre8-temurin-focal/Dockerfile
index 848ab40..8acbcd8 100644
--- a/tomcat_9-jre8-temurin-focal/Dockerfile
+++ b/tomcat_9-jre8-temurin-focal/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9-jre8/Dockerfile b/tomcat_9-jre8/Dockerfile
index 4399b8d..15f983e 100644
--- a/tomcat_9-jre8/Dockerfile
+++ b/tomcat_9-jre8/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_9/Dockerfile b/tomcat_9/Dockerfile
index efcd7f2..3dd51c0 100644
--- a/tomcat_9/Dockerfile
+++ b/tomcat_9/Dockerfile
@@ -146,4 +146,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_jdk11/Dockerfile b/tomcat_jdk11/Dockerfile
index 04de6e7..8743a23 100644
--- a/tomcat_jdk11/Dockerfile
+++ b/tomcat_jdk11/Dockerfile
@@ -145,4 +145,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_jre11/Dockerfile b/tomcat_jre11/Dockerfile
index 9bf0678..c9ea8cd 100644
--- a/tomcat_jre11/Dockerfile
+++ b/tomcat_jre11/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_jre17/Dockerfile b/tomcat_jre17/Dockerfile
index 42b525b..e5768cf 100644
--- a/tomcat_jre17/Dockerfile
+++ b/tomcat_jre17/Dockerfile
@@ -40,4 +40,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]
diff --git a/tomcat_latest/Dockerfile b/tomcat_latest/Dockerfile
index 1e0ef78..d83ab6d 100644
--- a/tomcat_latest/Dockerfile
+++ b/tomcat_latest/Dockerfile
@@ -145,4 +145,8 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+
+# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
+ENTRYPOINT []
+
 CMD ["catalina.sh", "run"]

Relevant Maintainers:

@yosifkit yosifkit merged commit e5c8252 into docker-library:master Aug 11, 2023
37 checks passed
@yosifkit yosifkit deleted the tomcat branch August 11, 2023 23:40
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