Fix PATH to include java when needed

Merge from master
CONFLICT (content): Merge conflict in start-configuration
2026-06-05 18:29:45 +00:00 · 2021-02-10 14:52:16 -06:00 · 2021-02-10 14:06:10 -06:00 · 2021-02-07 18:20:35 -06:00 · 2021-02-07 09:15:01 -06:00 · 2021-02-06 15:12:45 -06:00
2 changed files with 3 additions and 3 deletions
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:latest
+FROM adoptopenjdk:15-jre

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

@@ -95,7 +95,7 @@ case "${TYPE^^}" in

  FORGE)
    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
    log "         since some mods require Java 8"
    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
@@ -111,7 +111,7 @@ case "${TYPE^^}" in

  FTB|CURSEFORGE)
    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
    log "         since some mods require Java 8"
    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployCF "$@"
Author	SHA1	Message	Date
Geoff Bourne	b176be942d	Fix PATH to include java when needed	2021-02-10 14:52:16 -06:00
Geoff Bourne	51c5902db0	Merge from master CONFLICT (content): Merge conflict in start-configuration	2021-02-10 14:06:10 -06:00
Geoff Bourne	090e624ebc	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:20:35 -06:00
Geoff Bourne	c8dc751b82	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 09:15:01 -06:00
Geoff Bourne	7c862df92a	Merge branch 'master' into java15	2021-02-06 15:12:45 -06:00
Geoff Bourne	e49c1c2f01	Merge branch 'master' into java15	2021-02-06 15:11:34 -06:00
Geoff Bourne	57390b02ca	Merge branch 'master' into java15	2021-02-06 14:53:02 -06:00
Geoff Bourne	a698248dff	ci: Based on adoptopenjdk:15-jre	2021-02-06 14:50:43 -06:00