diff --git a/Dockerfile b/Dockerfile index c21bbd0a..9cf2b045 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8u212-jre-alpine +FROM adoptopenjdk/openjdk11:alpine-jre LABEL org.opencontainers.image.authors="Geoff Bourne " diff --git a/README.md b/README.md index 8ca50289..116c310d 100644 --- a/README.md +++ b/README.md @@ -158,11 +158,12 @@ the server jar remain in the `/data` directory. It is safe to remove those._ ## Running Minecraft server on different Java version -To use a different version of Java, please use a docker tag to run your Minecraft server. +To use a different version of Java, please use a docker tag to run your Minecraft server, where the tag is appended to the image such as `itzg/minecraft-server:TAG_NAME`. | Tag name | Description | Linux | | -------------- | ------------------------------------------- | ------------ | -| latest | **Default**. Uses Java version 8 | Alpine Linux | +| latest | **Default**. Uses AdoptOpenJDK version 11 | Alpine Linux | +| forge | Uses Java 8 for mod compatibility | Alpine Linux | | adopt15 | Uses Java version 15 from AdoptOpenJDK | Alpine Linux | | adopt14 | Uses Java version 14 from AdoptOpenJDK | Alpine Linux | | adopt13 | Uses Java version 13 from AdoptOpenJDK | Alpine Linux | @@ -170,7 +171,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf | openj9 | Uses Eclipse OpenJ9 JVM | Alpine Linux | | openj9-11 | Uses Eclipse OpenJ9 JVM for Java 11 | Alpine Linux | | openj9-nightly | Uses Eclipse OpenJ9 JVM testing builds | Alpine Linux | -| multiarch | Uses Java version 8 latest update | Debian Linux | +| multiarch | Uses Java version 8 | Debian Linux | | multiarch-latest | Uses Java version 15 latest update | Debian Linux | For example, to use a Java version 13: diff --git a/docker-versions-create.sh b/docker-versions-create.sh index b36f6f13..6e3a27d8 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -1,7 +1,7 @@ #!/bin/bash #set -x # Use this variable to indicate a list of branches that docker hub is watching -branches_list=('openj9' 'openj9-11' 'openj9-nightly' 'adopt11' 'adopt13' 'adopt14' 'adopt15' 'multiarch' 'multiarch-latest') +branches_list=('forge' 'openj9' 'openj9-11' 'openj9-nightly' 'adopt11' 'adopt13' 'adopt14' 'adopt15' 'multiarch' 'multiarch-latest') function TrapExit { echo "Checking out back in master" diff --git a/start-configuration b/start-configuration index 57a48b67..f68a841d 100644 --- a/start-configuration +++ b/start-configuration @@ -95,6 +95,10 @@ case "${TYPE^^}" in ;; FORGE) + log "**********************************************************************" + log "WARNING: Use the image tag itzg/minecraft-server:forge" + log " since some mods require Java 8" + log "**********************************************************************" exec ${SCRIPTS:-/}start-deployForge "$@" ;;