[es] Upgrade to 5.3.0

For #126

elasticsearch/Dockerfile

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

elasticsearch/README.md

@@ -181,7 +181,8 @@ To simplify all that, this image provides a `TYPE` variable to let you amongst t
 * `MASTER` : master-eligible, but holds no data. It is good to have three or more of these in a
 large cluster
 * `DATA` (or `NON_MASTER`) : holds data and serves search/index requests. Scale these out for elastic-y goodness.
-* `GATEWAY` : only operates as a client node or a "smart router". These are the ones whose HTTP port 9200 will need to be exposed
+* `GATEWAY` (or `COORDINATING`) : only operates as a client node or a "smart router". These are the ones whose HTTP port 9200 will need to be exposed
+* `INGEST` : operates only as an ingest node and is not master or data eligble
 
 A [Docker Compose](https://docs.docker.com/compose/overview/) file will serve as a good example of these three node types:
 

elasticsearch/docker-compose.yml

@@ -29,6 +29,13 @@ services:
     environment:
       TYPE: GATEWAY
       UNICAST_HOSTS: master
+  ingest:
+    image: itzg/elasticsearch
+    ports:
+      - "9222:9200"
+    environment:
+      TYPE: INGEST
+      UNICAST_HOSTS: master
   kibana:
     image: kibana
     ports:

elasticsearch/start

@@ -77,15 +77,19 @@ setup_personality() {
   if [ -n "$TYPE" ]; then
     case $TYPE in
       MASTER)
-        OPTS="$OPTS -E node.master=true -E node.data=false"
+        OPTS="$OPTS -E node.master=true -E node.data=false -E node.ingest=false"
         ;;
 
-      GATEWAY)
-        OPTS="$OPTS -E node.master=false -E node.data=false"
+      GATEWAY|COORDINATING)
+        OPTS="$OPTS -E node.master=false -E node.data=false -E node.ingest=false"
+        ;;
+
+      INGEST)
+        OPTS="$OPTS -E node.master=false -E node.data=false -E node.ingest=true"
         ;;
 
       DATA|NON_MASTER)
-        OPTS="$OPTS -E node.master=false -E node.data=true"
+        OPTS="$OPTS -E node.master=false -E node.data=true -E node.ingest=false"
         ;;
 
       *)

minecraft-server/Dockerfile

@@ -40,6 +40,6 @@ ENTRYPOINT [ "/start" ]
 
 ENV UID=1000 GID=1000 \
     MOTD="A Minecraft Server Powered by Docker" \
-    JVM_XX_OPTS="-XX:+UseG1GC" MAX_MEMORY="1G" \
+    JVM_XX_OPTS="-XX:+UseG1GC" 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,11 +608,16 @@ By default, server checks connecting players against Minecraft's account databas
 
 ### Memory Limit
 
-By default the image declares a Java memory limit of 1 GB. That can be adjusted
-higher (or lower) by setting the `MAX_MEMORY` environment variable. For example,
-the following increases the memory limit to 8 GB:
+By default, the image declares a Java initial and maximum memory limit of 1 GB. There are several
+ways to adjust the memory settings:
 
-    docker run -e MAX_MEMORY=8G ...
+* `MEMORY`, "1G" by default, can be used to adjust both initial (`Xms`) and max (`Xmx`)
+  memory settings of the JVM
+* `INIT_MEMORY`, independently sets the initial heap size
+* `MAX_MEMORY`, independently sets the max heap size
+
+The values of all three are passed directly to the JVM and support format/units as
+`<size>[g|G|m|M|k|K]`.
 
 ### /data ownership
 

minecraft-server/docker-compose-big.yml

@@ -1,9 +1,9 @@
 version: '3'
 
 services:
-  minecraft-server:
+  minecraft:
     ports:
-      - "25570:25565"
+      - "25565:25565"
     volumes:
       - "mcbig:/data"
     environment:
@@ -16,6 +16,14 @@ services:
       CONSOLE: "false"
     image: itzg/minecraft-server
     restart: always
+  rcon:
+    image: itzg/rcon
+    ports:
+      - "4326:4326"
+      - "4327:4327"
+    volumes:
+      - "rcon:/opt/rcon-web-admin/db"
 
 volumes:
   mcbig:
+  rcon:

minecraft-server/start-minecraft.sh

@@ -120,7 +120,7 @@ function installForge {
   echo "Checking Forge version information."
   case $FORGEVERSION in
     RECOMMENDED)
-      wget -q -O /tmp/forge.json -sSL http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
+      wget -q -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\"]")
       if [ $FORGE_VERSION = null ]; then
         FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$norm-latest\"]")
@@ -138,7 +138,7 @@ function installForge {
   esac
 
   # URL format changed for 1.7.10 from 10.13.2.1300
-  sorted=$( (echo $FORGE_VERSION; echo 10.13.2.1300) | sort -V | head -1)
+  sorted=$( (echo $FORGE_VERSION; echo 10.13.2.1300) | sort | head -1)
   if [[ $norm == '1.7.10' && $sorted == '10.13.2.1300' ]]; then
       # if $FORGEVERSION >= 10.13.2.1300
       normForgeVersion="$norm-$FORGE_VERSION-$norm"
@@ -189,7 +189,7 @@ function installFTB {
   echo "Unpacking FTB server modpack ${srv_modpack} ..."
   local ftb_dir=/data/FeedTheBeast
   mkdir -p ${ftb_dir}
-  unzip -u -o ${srv_modpack} -d ${ftb_dir}
+  unzip -o ${srv_modpack} -d ${ftb_dir}
   cp -f /data/eula.txt ${ftb_dir}/eula.txt
   FTB_SERVER_START=${ftb_dir}/ServerStart.sh
   chmod a+x ${FTB_SERVER_START}
@@ -491,10 +491,10 @@ 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
+# 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
     echo "Running FTB server modpack start ..."