[es] Add NON_DATA type

For #165

elasticsearch/Dockerfile

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

elasticsearch/README.md

@@ -181,8 +181,9 @@ 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.
+* `NON_DATA` : performs all duties except holding data
 * `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
+* `INGEST` : operates only as an ingest node and is not master or data eligible
 
 A [Docker Compose](https://docs.docker.com/compose/overview/) file will serve as a good example of these three node types:
 

elasticsearch/docker-compose-3x1GB.yml

@@ -0,0 +1,34 @@
+# This composition is known to work on a Swarm cluster consisting of
+# 3 VM nodes with 1GB allocated to each.
+version: '3'
+
+services:
+  master:
+    image: itzg/elasticsearch
+    environment:
+      UNICAST_HOSTS: master
+      MIN_MASTERS: 1
+      ES_JAVA_OPTS: -Xms756m -Xmx756m
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 1
+  data:
+    image: itzg/elasticsearch
+    deploy:
+      mode: global
+      update_config:
+        parallelism: 1
+    environment:
+      TYPE: DATA
+      UNICAST_HOSTS: master
+      ES_JAVA_OPTS: -Xms512m -Xmx512m
+  kibana:
+    image: kibana
+    ports:
+      - "5601:5601"
+    environment:
+      ELASTICSEARCH_URL: http://master:9200

elasticsearch/docker-compose-min.yml

@@ -0,0 +1,21 @@
+version: '3'
+
+services:
+  master:
+    image: itzg/elasticsearch
+    environment:
+      UNICAST_HOSTS: master
+      MIN_MASTERS: 1
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 1
+  kibana:
+    image: kibana
+    ports:
+      - "5601:5601"
+    environment:
+      ELASTICSEARCH_URL: http://master:9200

elasticsearch/start

@@ -99,10 +99,18 @@ setup_personality() {
         OPTS="$OPTS -E node.master=false -E node.data=false -E node.ingest=true"
         ;;
 
-      DATA|NON_MASTER)
+      DATA)
         OPTS="$OPTS -E node.master=false -E node.data=true -E node.ingest=false"
         ;;
 
+      NON_MASTER)
+        OPTS="$OPTS -E node.master=false -E node.data=true -E node.ingest=true"
+        ;;
+
+      NON_DATA)
+        OPTS="$OPTS -E node.master=true -E node.data=false -E node.ingest=true"
+        ;;
+
       *)
         echo "Unknown node type. Please use MASTER|GATEWAY|DATA|NON_MASTER"
         exit 1

minecraft-server/Dockerfile

@@ -1,12 +1,8 @@
-FROM alpine
-
+FROM openjdk:8u131-jre-alpine
 
 LABEL maintainer "itzg"
 
-RUN echo "http://dl-3.alpinelinux.org/alpine/v3.5/community/" >> /etc/apk/repositories &&\
-        apk update && \
-        apk add \
-          openjdk8-jre-base \
+RUN apk add -U \
           openssl \
           imagemagick \
           lsof \

minecraft-server/README.md

@@ -672,6 +672,20 @@ To use this option pass the environment variable `MODPACK`, such as
 top level of the zip archive. Make sure the jars are compatible with the
 particular `TYPE` of server you are running.
 
+### Remove old mods/plugins
+
+When the option above is specified (`MODPACK`) you can also instruct script to
+delete old mods/plugins prior to installing new ones. This behaviour is desirable
+in case you want to upgrade mods/plugins from downloaded zip file.
+To use this option pass the environment variable `REMOVE_OLD_MODS="TRUE"`, such as
+
+    docker run -d -e REMOVE_OLD_MODS="TRUE" -e MODPACK=http://www.example.com/mods/modpack.zip ...
+
+**NOTE:** This option will be taken into account only when option `MODPACK` is also used.
+
+**WARNING:** All content of the `mods` or `plugins` directory will be deleted 
+before unpacking new content from the zip file.
+
 ### Online mode
 
 By default, server checks connecting players against Minecraft's account database. If you want to create an offline server or your server is not connected to the internet, you can disable the server to try connecting to minecraft.net to authenticate players with environment variable `ONLINE_MODE`, like this

minecraft-server/start-minecraft.sh

@@ -403,9 +403,15 @@ case "X$MODPACK" in
     echo "  from $MODPACK ..."
     curl -sSL -o /tmp/modpack.zip "$MODPACK"
     if [ "$TYPE" = "SPIGOT" ]; then
+      if [ "$REMOVE_OLD_MODS" = "TRUE" ]; then
+        rm -rf /data/plugins/*
+      fi
       mkdir -p /data/plugins
       unzip -o -d /data/plugins /tmp/modpack.zip
     else
+      if [ "$REMOVE_OLD_MODS" = "TRUE" ]; then
+        rm -rf /data/mods/*
+      fi
       mkdir -p /data/mods
       unzip -o -d /data/mods /tmp/modpack.zip
     fi
@@ -441,11 +447,10 @@ if [ ! -e server.properties ]; then
   setServerProp "allow-nether" "$ALLOW_NETHER"
   setServerProp "announce-player-achievements" "$ANNOUNCE_PLAYER_ACHIEVEMENTS"
   setServerProp "enable-command-block" "$ENABLE_COMMAND_BLOCK"
-  setServerProp "spawn-animals" "$SPAWN_ANIMAILS"
+  setServerProp "spawn-animals" "$SPAWN_ANIMALS"
   setServerProp "spawn-monsters" "$SPAWN_MONSTERS"
   setServerProp "spawn-npcs" "$SPAWN_NPCS"
   setServerProp "generate-structures" "$GENERATE_STRUCTURES"
-  setServerProp "spawn-npcs" "$SPAWN_NPCS"
   setServerProp "view-distance" "$VIEW_DISTANCE"
   setServerProp "hardcore" "$HARDCORE"
   setServerProp "max-build-height" "$MAX_BUILD_HEIGHT"
@@ -527,7 +532,7 @@ if [ ! -e server.properties ]; then
         ;;
     esac
 
-    sed -i "/gamemode\s*=/ c gamemode=$MODE" $SERVER_PROPERTIES
+    sed -i "/^gamemode\s*=/ c gamemode=$MODE" $SERVER_PROPERTIES
   fi
 fi
 
@@ -555,11 +560,11 @@ if [ -n "$ICON" -a ! -e server-icon.png ]; then
   fi
 fi
 
-# Make sure files exist to avoid errors
-if [ ! -e banned-players.json ]; then
+# Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
+if [[ ! -e banned-players.json || ! $(jq banned-players.json &> /dev/null) ]]; then
 	echo '[]' > banned-players.json
 fi
-if [ ! -e banned-ips.json ]; then
+if [[ ! -e banned-ips.json || ! $(jq banned-ips.json &> /dev/null) ]]; then
 	echo '[]' > banned-ips.json
 fi