[mc] Add rcon to docker-compose.yml example

For #126

elasticsearch/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER itzg
 
 RUN apk -U add bash
 
-ENV ES_VERSION=5.2.0
+ENV ES_VERSION=5.2.1
 
 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp/es.tgz
 RUN cd /usr/share && \

minecraft-server/Dockerfile

@@ -38,6 +38,6 @@ ENTRYPOINT [ "/start" ]
 
 ENV UID=1000 GID=1000 \
     MOTD="A Minecraft Server Powered by Docker" \
-    JVM_OPTS="-Xmx1024M -Xms1024M" \
+    JVM_XX_OPTS="-XX:+UseG1GC" MAX_MEMORY="1G" \
     TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED LEVEL=world PVP=true DIFFICULTY=easy \
     LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= ONLINE_MODE=TRUE CONSOLE=true

minecraft-server/README.md

@@ -608,10 +608,11 @@ By default, server checks connecting players against Minecraft's account databas
 
 ### Memory Limit
 
-The Java memory limit can be adjusted using the `JVM_OPTS` environment variable, where the default is
+By default the image declares a Java memory limit of 1 GB. That can be adjusted
-the setting shown in the example (max and min at 1024 MB):
+higher (or lower) by setting the `MAX_MEMORY` environment variable. For example,
+the following increases the memory limit to 8 GB:
 
-    docker run -e 'JVM_OPTS=-Xmx1024M -Xms1024M' ...
+    docker run -e MAX_MEMORY=8G ...
 
 ### /data ownership
 

minecraft-server/docker-compose-big.yml

@@ -0,0 +1,21 @@
+version: '3'
+
+services:
+  minecraft-server:
+    ports:
+      - "25570:25565"
+    volumes:
+      - "mcbig:/data"
+    environment:
+      EULA: "TRUE"
+      MAX_MEMORY: 32G
+      MAX_BUILD_HEIGHT: 256
+      VIEW_DISTANCE: 15
+      LEVEL_TYPE: LARGEBIOMES
+      MAX_PLAYERS: 100
+      CONSOLE: "false"
+    image: itzg/minecraft-server
+    restart: always
+
+volumes:
+  mcbig:

minecraft-server/docker-compose.yml

@@ -1,14 +1,27 @@
-minecraft-server:
+version: '3'
-  ports:
-    - "25565:25565"
 
-  environment:
+services:
-    EULA: "TRUE"
+  minecraft:
+    image: itzg/minecraft-server
+    ports:
+      - "25565:25565"
+    volumes:
+      - "mc:/data"
+    environment:
+      EULA: "TRUE"
+      CONSOLE: "false"
+      ENABLE_RCON: "true"
+      RCON_PASSWORD: "testing"
+      RCON_PORT: 28016
+    restart: always
+  rcon:
+    image: itzg/rcon
+    ports:
+      - "4326:4326"
+      - "4327:4327"
+    volumes:
+      - "rcon:/opt/rcon-web-admin/db"
 
-  image: itzg/minecraft-server
+volumes:
-
+  mc:
-  container_name: minecraft-server
+  rcon:
-
-  tty: true
-  stdin_open: true
-  restart: always

minecraft-server/start-minecraft.sh

@@ -490,6 +490,11 @@ else
   EXTRA_ARGS=""
 fi
 
+if [[ ! -z $MAX_MEMORY ]]; then
+  # put prior JVM_OPTS at the end to give any memory settings there higher precedence
+  JVM_OPTS="-Xms${MAX_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
+fi
+set -x
 if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
     echo "Running FTB server modpack start ..."
     exec sh ${FTB_SERVER_START}
@@ -497,8 +502,8 @@ else
     # If we have a bootstrap.txt file... feed that in to the server stdin
     if [ -f /data/bootstrap.txt ];
     then
-        exec java $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS < /data/bootstrap.txt
+        exec java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS < /data/bootstrap.txt
     else
-        exec java $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
+        exec java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
     fi
 fi