feat(minecraft-server): add server-name to env variables

The server-name (e.g. needed for bungeecord) can now
be set via the env variable SERVER_NAME.
Defaults to Unknown

minecraft-server/Dockerfile

@@ -3,19 +3,19 @@ FROM openjdk:8u171-jre-alpine
 LABEL maintainer "itzg"
 
 RUN apk add --no-cache -U \
-          openssl \
+  openssl \
-          imagemagick \
+  imagemagick \
-          lsof \
+  lsof \
-          su-exec \
+  su-exec \
-          shadow \
+  shadow \
-          bash \
+  bash \
-          curl iputils wget \
+  curl iputils wget \
-          git \
+  git \
-          jq \
+  jq \
-          mysql-client \
+  mysql-client \
-          tzdata \
+  tzdata \
-          rsync \
+  rsync \
-          python python-dev py2-pip
+  python python-dev py2-pip
 
 RUN pip install mcstatus
 
@@ -71,7 +71,7 @@ ENV UID=1000 GID=1000 \
   JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
   TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= LEVEL=world \
   PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true
+  LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME=Unknown
 
 COPY start* /
 RUN dos2unix /start* && chmod +x /start*

minecraft-server/README.md

@@ -435,6 +435,11 @@ this server instance.
 
 ## Server configuration
 
+### Server name
+
+The server name (e.g. for bungeecord) can be set like:
+    docker run -d -e SERVER_NAME=MyServer ...
+
 ### Server port
 
 The server port can be set like:

minecraft-server/start-finalSetup04ServerProperties

@@ -50,6 +50,7 @@ if [ ! -e $SERVER_PROPERTIES ]; then
     MOTD="A ${label} Minecraft Server powered by Docker"
   fi
 
+  setServerProp "server-name" "$SERVER_NAME"
   setServerProp "server-port" "$SERVER_PORT"
   setServerProp "motd" "$MOTD"
   setServerProp "allow-nether" "$ALLOW_NETHER"