Merge branch 'master' into java8-multiarch

# Conflicts:
#	start-minecraftFinalSetup

Dockerfile

@@ -1,10 +1,11 @@
-FROM adoptopenjdk:latest
+FROM ubuntu:18.04
 
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
 RUN apt-get update \
   && DEBIAN_FRONTEND=noninteractive \
   apt-get install -y \
+    openjdk-8-jre-headless \
     imagemagick \
     gosu \
     sudo \

start-configuration

@@ -93,10 +93,6 @@ case "${TYPE^^}" in
   ;;
 
   FORGE)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
-    log "         since some mods require Java 8"
-    log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployForge "$@"
   ;;
 
@@ -108,11 +104,7 @@ case "${TYPE^^}" in
     exec ${SCRIPTS:-/}start-deployFTBA "$@"
   ;;
 
-  FTB|CURSEFORGE)
+  CURSEFORGE|FTB)
-    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
-    log "         since some mods require Java 8"
-    log "**********************************************************************"
     exec ${SCRIPTS:-/}start-deployCF "$@"
   ;;
 

start-deployFTBA

@@ -43,6 +43,9 @@ if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MO
   echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker}
 
   writeEula
+
+  # some modpacks result in --w----r-- permissions
+  chmod a+r version.json
 else
   log "FTB modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID} is ready to go"
 fi

start-minecraftFinalSetup

@@ -169,7 +169,7 @@ function copyFilesForCurseForge() {
 
 if ! which java > /dev/null; then
   log "Fixing PATH to include java"
-  PATH="${PATH}:/opt/java/openjdk/bin"
+  PATH="${PATH}:/usr/bin"
 fi
 
 mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"