Fix PATH to include java when needed

Auto-merging via docker-versions-create
2026-02-17 15:13:55 +00:00 · 2021-02-10 14:49:13 -06:00 · 2021-02-10 14:46:09 -06:00 · 2021-02-10 14:01:35 -06:00 · 2021-02-08 21:16:50 -06:00 · 2021-02-07 18:03:40 -06:00
3 changed files with 6 additions and 9 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:alpine-jre
+FROM openjdk:8u212-jre-alpine

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

--- a/8
+++ b/8
@@ -101,10 +101,6 @@ case "${TYPE^^}" in
  ;;

  FORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

@@ -113,10 +109,6 @@ case "${TYPE^^}" in
  ;;

  FTB|CURSEFORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
-    log "         since some mods require Java 8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;

--- a/5
+++ b/5
@@ -168,6 +168,11 @@ function copyFilesForCurseForge() {
  cp -f /data/eula.txt "${FTB_DIR}/"
 }

+if ! which java > /dev/null; then
+  log "Fixing PATH to include java"
+  PATH="${PATH}:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin"
+fi
+
 mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
    if isTrue ${DEBUG_EXEC}; then
Author	SHA1	Message	Date
Geoff Bourne	e78e5af96d	Fix PATH to include java when needed	2021-02-10 14:49:13 -06:00
Geoff Bourne	a2ab0d75ed	Fix PATH to include java when needed	2021-02-10 14:46:09 -06:00
Geoff Bourne	0fb9700fc7	Auto-merging via docker-versions-create	2021-02-10 14:01:35 -06:00
Geoff Bourne	18925ef32c	Merged latest from master	2021-02-08 21:16:50 -06:00
Geoff Bourne	f06b990f8a	Auto-merging via docker-versions-create	2021-02-07 18:03:40 -06:00
Geoff Bourne	75844ae81a	Fix java8 base image to actually be Java 8 #753	2021-02-07 11:10:38 -06:00
Geoff Bourne	6bb2323c46	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in docker-versions-create.sh Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.	2021-02-07 09:07:30 -06:00
Geoff Bourne	7814ca21b5	Merge branch 'master' into java8 # Conflicts: # README.md # start-configuration	2021-01-30 18:56:33 -06:00
Geoff Bourne	b8806629ec	Merged latest from master	2021-01-30 16:48:11 -06:00
Geoff Bourne	4a7f838a0f	Upgraded mainline/latest to Java 11	2021-01-30 16:16:36 -06:00
Geoff Bourne	2d07dee4df	Prepared forge branch's Dockerfile	2021-01-30 15:58:03 -06:00