Skip upstream openjdk entrypoint

The upstream entrypoint is `sh` and so loses dotted environment variables, lets prevent that from happening by just skipping it as the `tomcat` images isn't reliant on its functionality (docker-library/docs#2338). Fixes docker-library#302 which is a recurrence of docker-library#77
infosiftr · Aug 11, 2023 · 9104471 · 9104471
1 parent c0878b7
commit 9104471
Show file tree

Hide file tree

Showing 29 changed files with 176 additions and 0 deletions.
diff --git a/10.1/jdk11/temurin-jammy/Dockerfile b/10.1/jdk11/temurin-jammy/Dockerfile
diff --git a/10.1/jdk17/temurin-jammy/Dockerfile b/10.1/jdk17/temurin-jammy/Dockerfile
diff --git a/10.1/jre11/temurin-jammy/Dockerfile b/10.1/jre11/temurin-jammy/Dockerfile
diff --git a/10.1/jre17/temurin-jammy/Dockerfile b/10.1/jre17/temurin-jammy/Dockerfile
diff --git a/8.5/jdk11/temurin-focal/Dockerfile b/8.5/jdk11/temurin-focal/Dockerfile
diff --git a/8.5/jdk11/temurin-jammy/Dockerfile b/8.5/jdk11/temurin-jammy/Dockerfile
diff --git a/8.5/jdk17/temurin-focal/Dockerfile b/8.5/jdk17/temurin-focal/Dockerfile
diff --git a/8.5/jdk17/temurin-jammy/Dockerfile b/8.5/jdk17/temurin-jammy/Dockerfile
diff --git a/8.5/jdk8/temurin-focal/Dockerfile b/8.5/jdk8/temurin-focal/Dockerfile
diff --git a/8.5/jdk8/temurin-jammy/Dockerfile b/8.5/jdk8/temurin-jammy/Dockerfile
diff --git a/8.5/jre11/temurin-focal/Dockerfile b/8.5/jre11/temurin-focal/Dockerfile
diff --git a/8.5/jre11/temurin-jammy/Dockerfile b/8.5/jre11/temurin-jammy/Dockerfile
diff --git a/8.5/jre17/temurin-focal/Dockerfile b/8.5/jre17/temurin-focal/Dockerfile
diff --git a/8.5/jre17/temurin-jammy/Dockerfile b/8.5/jre17/temurin-jammy/Dockerfile
diff --git a/8.5/jre8/temurin-focal/Dockerfile b/8.5/jre8/temurin-focal/Dockerfile
diff --git a/8.5/jre8/temurin-jammy/Dockerfile b/8.5/jre8/temurin-jammy/Dockerfile
diff --git a/9.0/jdk11/temurin-focal/Dockerfile b/9.0/jdk11/temurin-focal/Dockerfile
diff --git a/9.0/jdk11/temurin-jammy/Dockerfile b/9.0/jdk11/temurin-jammy/Dockerfile
diff --git a/9.0/jdk17/temurin-focal/Dockerfile b/9.0/jdk17/temurin-focal/Dockerfile
diff --git a/9.0/jdk17/temurin-jammy/Dockerfile b/9.0/jdk17/temurin-jammy/Dockerfile
diff --git a/9.0/jdk8/temurin-focal/Dockerfile b/9.0/jdk8/temurin-focal/Dockerfile
diff --git a/9.0/jdk8/temurin-jammy/Dockerfile b/9.0/jdk8/temurin-jammy/Dockerfile
diff --git a/9.0/jre11/temurin-focal/Dockerfile b/9.0/jre11/temurin-focal/Dockerfile
diff --git a/9.0/jre11/temurin-jammy/Dockerfile b/9.0/jre11/temurin-jammy/Dockerfile
diff --git a/9.0/jre17/temurin-focal/Dockerfile b/9.0/jre17/temurin-focal/Dockerfile
diff --git a/9.0/jre17/temurin-jammy/Dockerfile b/9.0/jre17/temurin-jammy/Dockerfile
diff --git a/9.0/jre8/temurin-focal/Dockerfile b/9.0/jre8/temurin-focal/Dockerfile
diff --git a/9.0/jre8/temurin-jammy/Dockerfile b/9.0/jre8/temurin-jammy/Dockerfile
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -277,4 +277,12 @@ RUN set -eux; \
 	fi
 
 EXPOSE 8080
+{{ if vendor_variant | contains("temurin") then ( -}}
+
+# upstream eclipse-temurin-provided 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
+# see also https://github.com/docker-library/docs/pull/2338 https://github.com/adoptium/containers/pull/392
+ENTRYPOINT []
+
+{{ ) else "" end -}}
 CMD ["catalina.sh", "run"]