diff --git a/10.1/jdk11/temurin-jammy/Dockerfile b/10.1/jdk11/temurin-jammy/Dockerfile index 04de6e78..8743a23b 100644 --- a/10.1/jdk11/temurin-jammy/Dockerfile +++ b/10.1/jdk11/temurin-jammy/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/10.1/jdk17/temurin-jammy/Dockerfile b/10.1/jdk17/temurin-jammy/Dockerfile index 1e0ef780..d83ab6dd 100644 --- a/10.1/jdk17/temurin-jammy/Dockerfile +++ b/10.1/jdk17/temurin-jammy/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/10.1/jre11/temurin-jammy/Dockerfile b/10.1/jre11/temurin-jammy/Dockerfile index 9bf06780..c9ea8cd4 100644 --- a/10.1/jre11/temurin-jammy/Dockerfile +++ b/10.1/jre11/temurin-jammy/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/10.1/jre17/temurin-jammy/Dockerfile b/10.1/jre17/temurin-jammy/Dockerfile index 42b525b1..e5768cfa 100644 --- a/10.1/jre17/temurin-jammy/Dockerfile +++ b/10.1/jre17/temurin-jammy/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/8.5/jdk11/temurin-focal/Dockerfile b/8.5/jdk11/temurin-focal/Dockerfile index fcdbf6ce..03d05865 100644 --- a/8.5/jdk11/temurin-focal/Dockerfile +++ b/8.5/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/8.5/jdk11/temurin-jammy/Dockerfile b/8.5/jdk11/temurin-jammy/Dockerfile index 013ae7e7..4484e3db 100644 --- a/8.5/jdk11/temurin-jammy/Dockerfile +++ b/8.5/jdk11/temurin-jammy/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/8.5/jdk17/temurin-focal/Dockerfile b/8.5/jdk17/temurin-focal/Dockerfile index 342d635c..f254239c 100644 --- a/8.5/jdk17/temurin-focal/Dockerfile +++ b/8.5/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/8.5/jdk17/temurin-jammy/Dockerfile b/8.5/jdk17/temurin-jammy/Dockerfile index 7a0c3434..ef8065fd 100644 --- a/8.5/jdk17/temurin-jammy/Dockerfile +++ b/8.5/jdk17/temurin-jammy/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/8.5/jdk8/temurin-focal/Dockerfile b/8.5/jdk8/temurin-focal/Dockerfile index c024b5d9..ec4c1e3f 100644 --- a/8.5/jdk8/temurin-focal/Dockerfile +++ b/8.5/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/8.5/jdk8/temurin-jammy/Dockerfile b/8.5/jdk8/temurin-jammy/Dockerfile index 458e3aae..ae968a0f 100644 --- a/8.5/jdk8/temurin-jammy/Dockerfile +++ b/8.5/jdk8/temurin-jammy/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/8.5/jre11/temurin-focal/Dockerfile b/8.5/jre11/temurin-focal/Dockerfile index ddc45cbe..6bb43df4 100644 --- a/8.5/jre11/temurin-focal/Dockerfile +++ b/8.5/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/8.5/jre11/temurin-jammy/Dockerfile b/8.5/jre11/temurin-jammy/Dockerfile index 21f309fa..383cdb9d 100644 --- a/8.5/jre11/temurin-jammy/Dockerfile +++ b/8.5/jre11/temurin-jammy/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/8.5/jre17/temurin-focal/Dockerfile b/8.5/jre17/temurin-focal/Dockerfile index c17e8dcb..2509bae2 100644 --- a/8.5/jre17/temurin-focal/Dockerfile +++ b/8.5/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/8.5/jre17/temurin-jammy/Dockerfile b/8.5/jre17/temurin-jammy/Dockerfile index 9e6d30d1..0e8d502a 100644 --- a/8.5/jre17/temurin-jammy/Dockerfile +++ b/8.5/jre17/temurin-jammy/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/8.5/jre8/temurin-focal/Dockerfile b/8.5/jre8/temurin-focal/Dockerfile index ebdd314a..b4b3a4d4 100644 --- a/8.5/jre8/temurin-focal/Dockerfile +++ b/8.5/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/8.5/jre8/temurin-jammy/Dockerfile b/8.5/jre8/temurin-jammy/Dockerfile index b47fab82..1b9784bd 100644 --- a/8.5/jre8/temurin-jammy/Dockerfile +++ b/8.5/jre8/temurin-jammy/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/9.0/jdk11/temurin-focal/Dockerfile b/9.0/jdk11/temurin-focal/Dockerfile index edfd312a..96b96147 100644 --- a/9.0/jdk11/temurin-focal/Dockerfile +++ b/9.0/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/9.0/jdk11/temurin-jammy/Dockerfile b/9.0/jdk11/temurin-jammy/Dockerfile index 7d808faf..34556110 100644 --- a/9.0/jdk11/temurin-jammy/Dockerfile +++ b/9.0/jdk11/temurin-jammy/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/9.0/jdk17/temurin-focal/Dockerfile b/9.0/jdk17/temurin-focal/Dockerfile index d92c876e..fb9e479f 100644 --- a/9.0/jdk17/temurin-focal/Dockerfile +++ b/9.0/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/9.0/jdk17/temurin-jammy/Dockerfile b/9.0/jdk17/temurin-jammy/Dockerfile index efcd7f27..3dd51c05 100644 --- a/9.0/jdk17/temurin-jammy/Dockerfile +++ b/9.0/jdk17/temurin-jammy/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/9.0/jdk8/temurin-focal/Dockerfile b/9.0/jdk8/temurin-focal/Dockerfile index 59da0520..35a90b4a 100644 --- a/9.0/jdk8/temurin-focal/Dockerfile +++ b/9.0/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/9.0/jdk8/temurin-jammy/Dockerfile b/9.0/jdk8/temurin-jammy/Dockerfile index 83879035..24c34a74 100644 --- a/9.0/jdk8/temurin-jammy/Dockerfile +++ b/9.0/jdk8/temurin-jammy/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/9.0/jre11/temurin-focal/Dockerfile b/9.0/jre11/temurin-focal/Dockerfile index 215cf5c6..d0e9eb6c 100644 --- a/9.0/jre11/temurin-focal/Dockerfile +++ b/9.0/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/9.0/jre11/temurin-jammy/Dockerfile b/9.0/jre11/temurin-jammy/Dockerfile index d97e737c..a34590cb 100644 --- a/9.0/jre11/temurin-jammy/Dockerfile +++ b/9.0/jre11/temurin-jammy/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/9.0/jre17/temurin-focal/Dockerfile b/9.0/jre17/temurin-focal/Dockerfile index 4c9051c4..d261f1b7 100644 --- a/9.0/jre17/temurin-focal/Dockerfile +++ b/9.0/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/9.0/jre17/temurin-jammy/Dockerfile b/9.0/jre17/temurin-jammy/Dockerfile index 4bb651bf..6be65a66 100644 --- a/9.0/jre17/temurin-jammy/Dockerfile +++ b/9.0/jre17/temurin-jammy/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/9.0/jre8/temurin-focal/Dockerfile b/9.0/jre8/temurin-focal/Dockerfile index 848ab40f..8acbcd82 100644 --- a/9.0/jre8/temurin-focal/Dockerfile +++ b/9.0/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/9.0/jre8/temurin-jammy/Dockerfile b/9.0/jre8/temurin-jammy/Dockerfile index 4399b8d7..15f983ed 100644 --- a/9.0/jre8/temurin-jammy/Dockerfile +++ b/9.0/jre8/temurin-jammy/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/Dockerfile.template b/Dockerfile.template index 4eeabc7e..d553a0f2 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -277,4 +277,10 @@ RUN set -eux; \ fi EXPOSE 8080 +{{ if vendor_variant | contains("temurin") then ( -}} + +# 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 [] + +{{ ) else "" end -}} CMD ["catalina.sh", "run"]