[mc] Use a probing approach to find Forge URL and launcher name

For #91 and #153

build

@@ -5,10 +5,8 @@ pkgs="$pkgs minecraft-server"
 pkgs="$pkgs elasticsearch"
 pkgs="$pkgs kibana"
 pkgs="$pkgs titan-gremlin"
-pkgs="$pkgs cassandra"
 
 for p in $pkgs
 do
   docker build -t itzg/$p $p
 done
-

elasticsearch/Dockerfile

@@ -1,10 +1,10 @@
 FROM openjdk:8u121-jre-alpine
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 RUN apk -U add bash
 
-ENV ES_VERSION=5.3.2
+ENV ES_VERSION=5.4.0
 
 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp/es.tgz
 RUN cd /usr/share && \

elasticsearch/README.md

@@ -187,7 +187,7 @@ large cluster
 A [Docker Compose](https://docs.docker.com/compose/overview/) file will serve as a good example of these three node types:
 
 ```
-version: '2'
+version: '3'
 
 services:
   gateway:
@@ -210,6 +210,14 @@ services:
     environment:
       UNICAST_HOSTS: master,gateway
       TYPE: DATA
+
+  kibana:
+    image: kibana
+    ports:
+      - "5601:5601"
+    environment:
+      ELASTICSEARCH_URL: http://gateway:9200
+
 ```
 
 ## Minimum Master Nodes

gitblit/Dockerfile

@@ -1,18 +1,18 @@
 FROM java:8
- 
+
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV GITBLIT_VERSION 1.7.1
- 
+
 RUN wget -qO /tmp/gitblit.tgz http://dl.bintray.com/gitblit/releases/gitblit-$GITBLIT_VERSION.tar.gz
- 
+
 RUN tar -C /opt -xvf /tmp/gitblit.tgz && \
     rm /tmp/gitblit.tgz
- 
+
 VOLUME ["/data"]
- 
+
 ADD start.sh /start
- 
+
 ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \
     GITBLIT_HTTPS_PORT=443 \
     GITBLIT_HTTP_PORT=80 \
@@ -20,7 +20,7 @@ ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \
     GITBLIT_ADMIN_USER=admin \
     GITBLIT_INITIAL_REPO=
 WORKDIR $GITBLIT_PATH
- 
+
 EXPOSE 80 443
- 
+
 ENTRYPOINT ["/start"]

gvm/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 RUN apt-get install -y curl unzip
 

jekyll-github-pages/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:trusty
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV APT_GET_UPDATE 2014-09-18
 
@@ -21,4 +21,3 @@ EXPOSE 4000
 
 ADD start.sh /start
 CMD ["/start"]
-

jenkins/Dockerfile

@@ -1,6 +1,6 @@
 FROM java:openjdk-8u102-jdk
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y \

kibana/Dockerfile

@@ -1,6 +1,6 @@
 FROM openjdk:8u111-jre
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV KIBANA_VERSION 5.1.2
 

logstash/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV LOGSTASH_VERSION 1.5.0-1
 

minecraft-server/Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine
 
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 RUN echo "http://dl-3.alpinelinux.org/alpine/v3.5/community/" >> /etc/apk/repositories &&\
         apk update && \
@@ -14,7 +14,9 @@ RUN echo "http://dl-3.alpinelinux.org/alpine/v3.5/community/" >> /etc/apk/reposi
           bash \
           curl \
           git \
-          jq &&\
+          jq \
+          mysql-client \
+          python python-dev && \
         rm -rf /var/cache/apk/*
 
 RUN addgroup -g 1000 minecraft \

minecraft-server/README.md

@@ -307,6 +307,13 @@ Now you can add a `-e FTB_SERVER_MOD=name_of_modpack.zip` to your command-line.
         -e FTB_SERVER_MOD=FTBPresentsSkyfactory3Server_3.0.6.zip \
         -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
 
+Instead of explicitly downloading a modpack from the Feed the Beast site, you
+can you set `FTB_SERVER_MOD` to the **server** URL of a modpack, such as
+
+    $ docker run ... \
+      -e TYPE=FTB \
+      -e FTB_SERVER_MOD=https://www.feed-the-beast.com/projects/ftb-infinity-lite-1-10/files/2402889
+
 ### Using the /data volume
 
 You must use a persistent `/data` mount for this type of server.

minecraft-server/start-minecraft.sh

@@ -18,6 +18,8 @@ if [ ! -e /data/eula.txt ]; then
   fi
 fi
 
+SERVER_PROPERTIES=/data/server.properties
+FTB_DIR=/data/FeedTheBeast
 VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
 
 echo "Checking version information."
@@ -75,7 +77,7 @@ function downloadSpigot {
   fi
 
   echo "Downloading $match"
-  curl -fsSL -o $SERVER "$downloadUrl"
+  curl -kfsSL -o $SERVER "$downloadUrl"
   status=$?
   if [ ! -f $SERVER ]; then
     echo "ERROR: failed to download from $downloadUrl (status=$status)"
@@ -121,15 +123,22 @@ function installForge {
   TYPE=FORGE
   norm=$VANILLA_VERSION
 
+  case $VANILLA_VERSION in
+    *.*.*)
+      norm=$VANILLA_VERSION ;;
+    *.*)
+      norm=${VANILLA_VERSION}.0 ;;
+  esac
+
   echo "Checking Forge version information."
   case $FORGEVERSION in
     RECOMMENDED)
       curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
-      FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$norm-recommended\"]")
+      FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]")
       if [ $FORGE_VERSION = null ]; then
-        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$norm-latest\"]")
+        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
         if [ $FORGE_VERSION = null ]; then
-          echo "ERROR: Version $FORGE_VERSION is not supported by Forge"
+          echo "ERROR: Version $VANILLA_VERSION is not supported by Forge"
           echo "       Refer to http://files.minecraftforge.net/ for supported versions"
           exit 2
         fi
@@ -141,25 +150,67 @@ function installForge {
       ;;
   esac
 
-  # URL format changed for 1.7.10 from 10.13.2.1300
+  normForgeVersion=$VANILLA_VERSION-$FORGE_VERSION-$norm
-  sorted=$( (echo $FORGE_VERSION; echo 10.13.2.1300) | sort | head -1)
+  shortForgeVersion=$VANILLA_VERSION-$FORGE_VERSION
-  if [[ $norm == '1.7.10' && $sorted == '10.13.2.1300' ]]; then
+
-      # if $FORGEVERSION >= 10.13.2.1300
+  forgeFileNames="
-      normForgeVersion="$norm-$FORGE_VERSION-$norm"
+  $normForgeVersion/forge-$normForgeVersion-installer.jar
+  $shortForgeVersion/forge-$shortForgeVersion-installer.jar
+  END
+"
+
+  FORGE_INSTALLER="/tmp/forge-$shortForgeVersion-installer.jar"
+  installMarker=".forge-installed-$shortForgeVersion"
+
+  if [ ! -e $installMarker ]; then
+    if [ ! -e $FORGE_INSTALLER ]; then
+      echo "Downloading $normForgeVersion"
+      for fn in $forgeFileNames; do
+        if [ $fn == END ]; then
+          echo "Unable to compute URL for $normForgeVersion"
+          exit 2
+        fi
+        downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
+        echo "...trying $downloadUrl"
+        if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
+          break
+        fi
+      done
+
+      echo "Installing Forge $shortForgeVersion"
+      mkdir -p mods
+      tries=3
+      while ((--tries >= 0)); do
+        java -jar $FORGE_INSTALLER --installServer
+        if [ $? == 0 ]; then
+          break
+        fi
+      done
+      if (($tries < 0)); then
+        echo "Forge failed to install after several tries." >&2
+        exit 10
+      fi
+      SERVER=$(ls *forge*$shortForgeVersion*.jar)
+      if [ -z $SERVER ]; then
+        echo "Unable to derive server jar for Forge $shortForgeVersion"
+        exit 2
+      fi
+
+      echo "Using server $SERVER"
+      echo $SERVER > $installMarker
+    fi
   else
-      normForgeVersion="$norm-$FORGE_VERSION"
+    SERVER=$(cat $installMarker)
   fi
+}
 
-  FORGE_INSTALLER="forge-$normForgeVersion-installer.jar"
+function isURL {
-  SERVER="forge-$normForgeVersion-universal.jar"
+  local value=$1
 
-  downloadUrl="http://files.minecraftforge.net/maven/net/minecraftforge/forge/$normForgeVersion/$FORGE_INSTALLER"
+  if [[ ${value:0:8} == "https://" || ${value:0:7} = "http://" ]]; then
-
+    return 0
-  if [ ! -e "$SERVER" ]; then
+  else
-    echo "Downloading $FORGE_INSTALLER ..."
+    return 1
-    wget -q $downloadUrl
-    echo "Installing $SERVER"
-    java -jar $FORGE_INSTALLER --installServer
   fi
 }
 
@@ -174,6 +225,20 @@ function installFTB {
       exit 2
   fi
   local srv_modpack=${FTB_SERVER_MOD}
+  if isURL ${srv_modpack}; then
+      case $srv_modpack in
+        */download)
+          break;;
+        *)
+          srv_modpack=${srv_modpack}/download;;
+      esac
+      local file=$(basename $(dirname $srv_modpack))
+      local downloaded=/data/${file}.zip
+      echo "Downloading FTB modpack...
+  $srv_modpack -> $downloaded"
+      curl -sSL -o $downloaded $srv_modpack
+      srv_modpack=$downloaded
+  fi
   if [[ ${srv_modpack:0:5} == "data/" ]]; then
       # Prepend with "/"
       srv_modpack=/${srv_modpack}
@@ -193,12 +258,12 @@ function installFTB {
   fi
 
   echo "Unpacking FTB server modpack ${srv_modpack} ..."
-  local ftb_dir=/data/FeedTheBeast
+  mkdir -p ${FTB_DIR}
-  mkdir -p ${ftb_dir}
+  unzip -o ${srv_modpack} -d ${FTB_DIR}
-  unzip -o ${srv_modpack} -d ${ftb_dir}
+  cp -f /data/eula.txt ${FTB_DIR}/eula.txt
-  cp -f /data/eula.txt ${ftb_dir}/eula.txt
+  FTB_SERVER_START=${FTB_DIR}/ServerStart.sh
-  FTB_SERVER_START=${ftb_dir}/ServerStart.sh
   chmod a+x ${FTB_SERVER_START}
+  sed -i "s/-jar/-Dfml.queryResult=confirm -jar/" ${FTB_SERVER_START}
 }
 
 function installVanilla {
@@ -303,8 +368,8 @@ if [[ "$MODPACK" ]]; then
 case "X$MODPACK" in
   X[Hh][Tt][Tt][Pp]*[Zz][iI][pP])
     echo "Downloading mod/plugin pack via HTTP"
-    echo "$MODPACK"
+    echo "  from $MODPACK ..."
-    wget -q -O /tmp/modpack.zip "$MODPACK"
+    curl -sSL -o /tmp/modpack.zip "$MODPACK"
     if [ "$TYPE" = "SPIGOT" ]; then
       mkdir -p /data/plugins
       unzip -o -d /data/plugins /tmp/modpack.zip
@@ -430,7 +495,7 @@ if [ ! -e server.properties ]; then
         ;;
     esac
 
-    sed -i "/gamemode\s*=/ c gamemode=$MODE" /data/server.properties
+    sed -i "/gamemode\s*=/ c gamemode=$MODE" $SERVER_PROPERTIES
   fi
 fi
 
@@ -467,12 +532,12 @@ if [ ! -e banned-ips.json ]; then
 fi
 
 # If any modules have been provided, copy them over
-[ -d /data/mods ] || mkdir /data/mods
+mkdir -p /data/mods
-for m in /mods/*.jar
+for m in /mods/*.{jar,zip}
 do
-  if [ -f "$m" ]; then
+  if [ -f "$m" -a ! -f "/data/mods/$m" ]; then
     echo Copying mod `basename "$m"`
-    cp -f "$m" /data/mods
+    cp "$m" /data/mods
   fi
 done
 [ -d /data/config ] || mkdir /data/config
@@ -491,18 +556,25 @@ if [ "$TYPE" = "SPIGOT" ]; then
   fi
 fi
 
-if [[ $CONSOLE = false ]]; then
+EXTRA_ARGS=""
-  EXTRA_ARGS=--noconsole
+# Optional disable console
-else
+if [[ ${CONSOLE} = false || ${CONSOLE} = FALSE ]]; then
-  EXTRA_ARGS=""
+  EXTRA_ARGS+="--noconsole"
+fi
+
+# Optional disable GUI for headless servers
+if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
+  EXTRA_ARGS="${EXTRA_ARGS} nogui"
 fi
 
 # put these prior JVM_OPTS at the end to give any memory settings there higher precedence
 echo "Setting initial memory to ${INIT_MEMORY:-${MEMORY}} and max to ${MAX_MEMORY:-${MEMORY}}"
 JVM_OPTS="-Xms${INIT_MEMORY:-${MEMORY}} -Xmx${MAX_MEMORY:-${MEMORY}} ${JVM_OPTS}"
 
-set -x
 if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
+    cp -f $SERVER_PROPERTIES ${FTB_DIR}/server.properties
+    cp -f /data/{eula,ops,white-list}.txt ${FTB_DIR}/
+    cd ${FTB_DIR}
     echo "Running FTB server modpack start ..."
     exec sh ${FTB_SERVER_START}
 else

spring-boot/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/gvm
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 RUN ["/run", "install", "springboot"]
 

titan-gremlin/Dockerfile

@@ -1,11 +1,12 @@
-FROM itzg/ubuntu-openjdk-7
+FROM openjdk:8-jre
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV TITAN_VERSION 0.5.4
 
-RUN wget -q -O /tmp/titan.zip http://s3.thinkaurelius.com/downloads/titan/titan-$TITAN_VERSION-hadoop2.zip
+ADD http://s3.thinkaurelius.com/downloads/titan/titan-$TITAN_VERSION-hadoop2.zip /tmp/titan.zip
-RUN unzip -q /tmp/titan.zip -d /opt && rm /tmp/titan.zip
+RUN unzip -q /tmp/titan.zip -d /opt && \
+    rm /tmp/titan.zip
 
 ENV TITAN_HOME /opt/titan-$TITAN_VERSION-hadoop2
 WORKDIR $TITAN_HOME

titandb/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV APT_GET_UPDATE 2014-07-19
 

ubuntu-openjdk-7/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:trusty
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV APT_GET_UPDATE 2015-10-29
 RUN apt-get update