Merge pull request #303 from infosiftr/fix-77-again

Skip upstream openjdk entrypoint
docker-library · Aug 11, 2023 · 18d7f71 · 18d7f71
2 parents c0878b7 + 55546d6
commit 18d7f71
Show file tree

Hide file tree

Showing 29 changed files with 118 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,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"]