Auto-merging via docker-versions-create

Merge branch 'master' into java8
# Conflicts: # start-configuration # start-deployCF
2026-02-17 15:13:55 +00:00 · 2021-04-01 16:30:55 -05:00 · 2021-03-18 19:58:16 -05:00 · 2021-03-14 15:02:40 -05:00 · 2021-03-13 16:54:56 -06:00 · 2021-03-11 19:40:26 -06:00
2 changed files with 2 additions and 14 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/14
+++ b/14
@@ -63,7 +63,7 @@ fi

 if ! which java > /dev/null; then
  log "Fixing PATH to include java"
-  PATH="${PATH}:/opt/java/openjdk/bin"
+  PATH="${PATH}:/usr/bin"
 fi

 export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
@@ -105,12 +105,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 "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;

@@ -119,12 +113,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 "         Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
-    log "         can be fixed with java8"
-    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployCF "$@"
  ;;
Author	SHA1	Message	Date
Geoff Bourne	45856a1a81	Auto-merging via docker-versions-create	2021-04-01 16:30:55 -05:00
Geoff Bourne	1e615e76e8	Merge branch 'master' into java8 # Conflicts: # start-configuration # start-deployCF	2021-03-18 19:58:16 -05:00
Geoff Bourne	1c85a685de	Added support for CF modpacks using settings.cfg #772 #800	2021-03-14 15:02:40 -05:00
Geoff Bourne	7cd207f40b	docs: Added more info about getbukkit's weird 1.8 file naming #103	2021-03-13 16:54:56 -06:00
Geoff Bourne	140a8aa90c	Merge branch 'master' into java8	2021-03-11 19:40:26 -06:00
Geoff Bourne	76dcff9d18	Merge branch 'master' into java8	2021-03-11 17:23:48 -06:00
Geoff Bourne	a9a86d249b	Merge branch 'master' into java8 # Conflicts: # start-configuration	2021-03-06 16:23:07 -06:00
Geoff Bourne	595760d301	Shifted PATH-fix earlier in startup	2021-03-06 16:04:06 -06:00
Geoff Bourne	6d3f194ce3	Merge from master	2021-02-27 20:47:00 -06:00
Geoff Bourne	21c1620f0c	misc: java is actually found in /usr/bin by default	2021-02-11 15:05:45 -06:00
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