[es] Port over Swarm compatible binding address lookup

Added CONSOLE envvar to control console output

cassandra/Dockerfile

@@ -2,7 +2,7 @@ FROM java:openjdk-8u72-jdk
 
 MAINTAINER itzg
 
-ENV CASSANDRA_VERSION 2.2.6
+ENV CASSANDRA_VERSION 2.2.7
 
 RUN wget -qO /tmp/apache-cassandra.tgz http://mirrors.ibiblio.org/apache/cassandra/$CASSANDRA_VERSION/apache-cassandra-$CASSANDRA_VERSION-bin.tar.gz
 RUN tar -C /opt -zxf /tmp/apache-cassandra.tgz && \

elasticsearch/Dockerfile

@@ -1,20 +1,19 @@
-FROM java:8u92-jre-alpine
+FROM java:8u111-jre-alpine
 
 MAINTAINER itzg
 
-ENV ES_VERSION=2.4.0
+ENV ES_VERSION=2.4.3
 
 ADD https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$ES_VERSION/elasticsearch-$ES_VERSION.tar.gz /tmp/es.tgz
 RUN cd /usr/share && \
   tar xf /tmp/es.tgz && \
   rm /tmp/es.tgz
 
-ADD start /start
+COPY start /start
 
 EXPOSE 9200 9300
 
 ENV ES_HOME=/usr/share/elasticsearch-$ES_VERSION \
-    OPTS=-Dnetwork.host=_non_loopback_ \
     DEFAULT_ES_USER=elasticsearch
 
 RUN adduser -S -s /bin/sh $DEFAULT_ES_USER

elasticsearch/README.md

@@ -49,7 +49,19 @@ and then check the cluster health, such as http://192.168.99.100:9200/_cluster/h
       "unassigned_shards" : 0
     }
 
-# Configuration
+# Configuration Summary
+
+## Ports
+
+* `9200` - HTTP REST
+* `9300` - Native transport
+
+## Volumes
+
+* `/data` - location of `path.data`
+* `/conf` - location of `path.conf`
+
+# Configuration Details
 
 The following configuration options are specified using `docker run` environment variables (`-e`) like
 
@@ -170,13 +182,14 @@ Using the Docker Compose file above, a value of `2` is appropriate when scaling
 
     docker-compose scale master=3
 
-## Auto transport/http discovery with Swarm Mode
+## Multiple Network Binding, such as Swarm Mode
 
-When using Docker Swarm mode (starting with 1.12), the overlay and ingress network interfaces are assigned
-multiple IP addresses. As a result, it creates confusion for the transport publish logic even when using
-the special value `_eth0_`.
+When using Docker Swarm mode the container is presented with multiple ethernet
+devices. By default, all global, routable IP addresses are configured for
+Elasticsearch to use as `network.host`.
 
-To resolve this, add
+That discovery can be overridden by providing a specific ethernet device name
+to `DISCOVER_TRANSPORT_IP` and/or `DISCOVER_HTTP_IP`, such as
 
     -e DISCOVER_TRANSPORT_IP=eth0
 

elasticsearch/start

@@ -26,12 +26,11 @@ discoverIpFromLink() {
   OPTS="$OPTS -Des.$mode.host=$ip"
 }
 
-if [ "$DISCOVER_TRANSPORT_IP" != "" ]; then
-  discoverIpFromLink $DISCOVER_TRANSPORT_IP transport
-fi
-if [ "$DISCOVER_HTTP_IP" != "" ]; then
-  discoverIpFromLink $DISCOVER_HTTP_IP http
-fi
+discoverAllGlobalIps() {
+  ips=`ipaddr show scope global|awk '$1 == "inet" { if (!match($2,"/32")) { gsub("/.*","",$2) ; addrs[length(addrs)] = $2 } } END { for (i in addrs) { if (i>0) printf "," ; printf addrs[i] } }'`
+  OPTS="$OPTS --network.host=$ips"
+}
+
 
 if [ -n "$CLUSTER" ]; then
   OPTS="$OPTS -Des.cluster.name=$CLUSTER"
@@ -98,6 +97,7 @@ else
   mkdir -p /conf/plugins
 fi
 
+discoverAllGlobalIps
 mkdir -p /conf/scripts
 
 echo "Starting Elasticsearch with the options $OPTS"

minecraft-server/Dockerfile

@@ -19,7 +19,8 @@ RUN useradd -s /bin/false --uid 1000 minecraft \
   && mkdir /config \
   && mkdir /mods \
   && mkdir /plugins \
-  && chown minecraft:minecraft /data /config /mods /plugins
+  && mkdir /home/minecraft \
+  && chown minecraft:minecraft /data /config /mods /plugins /home/minecraft
 
 EXPOSE 25565 25575
 
@@ -39,4 +40,4 @@ ENV UID=1000 GID=1000 \
     MOTD="A Minecraft Server Powered by Docker" \
     JVM_OPTS="-Xmx1024M -Xms1024M" \
     TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED LEVEL=world PVP=true DIFFICULTY=easy \
-    LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= ONLINE_MODE=TRUE
+    LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= ONLINE_MODE=TRUE CONSOLE=true

minecraft-server/README.md

@@ -543,7 +543,7 @@ By default, server checks connecting players against Minecraft's account databas
 
     docker run -d -e ONLINE_MODE=FALSE ...
 
-## JVM Configuration
+## Miscellaneous Options
 
 ### Memory Limit
 
@@ -551,3 +551,7 @@ The Java memory limit can be adjusted using the `JVM_OPTS` environment variable,
 the setting shown in the example (max and min at 1024 MB):
 
     docker run -e 'JVM_OPTS=-Xmx1024M -Xms1024M' ...
+
+### /data ownership
+
+In order to adapt to differences in `UID` and `GID` settings the entry script will attempt to correct ownership and writability of the `/data` directory. This logic can be disabled by setting `-e SKIP_OWNERSHIP_FIX=TRUE`.

minecraft-server/start-minecraft.sh

@@ -441,10 +441,16 @@ if [ "$TYPE" = "SPIGOT" ]; then
   fi
 fi
 
+if [[ $CONSOLE = false ]]; then
+  EXTRA_ARGS=--noconsole
+else
+  EXTRA_ARGS=""
+fi
+
 # 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 "$@" < /data/bootstrap.txt
+    exec java $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS < /data/bootstrap.txt
 else
-    exec java $JVM_OPTS -jar $SERVER "$@"
+    exec java $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
 fi

minecraft-server/start.sh

@@ -4,16 +4,19 @@ set -e
 usermod --uid $UID minecraft
 groupmod --gid $GID minecraft
 
-chown -R minecraft:minecraft /data /start-minecraft /home/minecraft
-chmod -R g+wX /data /start-minecraft
+if [ "$SKIP_OWNERSHIP_FIX" != "TRUE" ]; then
+  fix_ownership() {
+    dir=$1
+    if ! sudo -u minecraft test -w $dir; then
+      echo "Correcting writability of $dir ..."
+      chown -R minecraft:minecraft $dir
+      chmod -R u+w $dir
+    fi
+  }
 
-while lsof -- /start-minecraft; do
-  echo -n "."
-  sleep 1
-done
-
-mkdir -p /home/minecraft
-chown minecraft: /home/minecraft
+  fix_ownership /data
+  fix_ownership /home/minecraft
+fi
 
 echo "Switching to user 'minecraft'"
 exec sudo -E -u minecraft /start-minecraft "$@"