Merge pull request #115 from ikke-t/alpine

Switch to Alpine linux for container base

elasticsearch/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER itzg
 
 RUN apk -U add bash
 
-ENV ES_VERSION=5.1.1
+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 && \
@@ -13,10 +13,10 @@ RUN cd /usr/share && \
 
 EXPOSE 9200 9300
 
+HEALTHCHECK --timeout=5s CMD wget -q -O - http://$HOSTNAME:9200/_cat/health
+
 ENV ES_HOME=/usr/share/elasticsearch-$ES_VERSION \
     DEFAULT_ES_USER=elasticsearch \
-    DISCOVER_TRANSPORT_IP=eth0 \
-    DISCOVER_HTTP_IP=eth0 \
     ES_JAVA_OPTS="-Xms1g -Xmx1g"
 
 RUN adduser -S -s /bin/sh $DEFAULT_ES_USER

elasticsearch/README.md

@@ -54,6 +54,40 @@ and then check the cluster health, such as http://192.168.99.100:9200/_cluster/h
       "unassigned_shards" : 0
     }
 
+If you have a Docker Swarm cluster already initialized you can download this
+[docker-compose.yml](https://raw.githubusercontent.com/itzg/dockerfiles/master/elasticsearch/docker-compose.yml) and deploy a cluster using:
+
+    docker stack deploy -c docker-compose.yml es
+
+
+With a `docker service ls` you can confirm 1 master, 2 data, and 1 gateway nodes are running:
+
+```
+ID            NAME        MODE        REPLICAS  IMAGE
+9nwnno8hbqgk  es_kibana   replicated  1/1       kibana:latest
+f5x7nipwmvkr  es_gateway  replicated  1/1       es
+om8rly2yxylw  es_data     replicated  2/2       es
+tdvfilj370yn  es_master   replicated  1/1       es
+```
+
+As you can see, there is also a Kibana instance included and available at port 5601.
+
+# Health Checks
+
+This container declares a [HEALTHCHECK](https://docs.docker.com/engine/reference/builder/#/healthcheck) that queries the `_cat/health`
+endpoint for a quick, one-line gauge of health every 30 seconds.
+
+The current health of the container is shown in the `STATUS` column of `docker ps`, such as
+
+    Up 14 minutes (healthy)
+
+You can also check the history of health checks from `inspect`, such as:
+
+```
+> docker inspect -f "{{json .State.Health}}" es
+{"Status":"healthy","FailingStreak":0,"Log":[...
+```
+
 # Configuration Summary
 
 ## Ports
@@ -187,20 +221,16 @@ 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
-
-replacing `eth0` with another interface within the container, if needed.
-
-The same can be done for publish/binding of the http module by adding:
-
     -e DISCOVER_HTTP_IP=eth2
 
 ## Heap size and other JVM options

elasticsearch/docker-compose.yml

@@ -0,0 +1,37 @@
+version: '3'
+
+services:
+  master:
+    image: itzg/elasticsearch
+    environment:
+      TYPE: MASTER
+      UNICAST_HOSTS: master
+      MIN_MASTERS: 1
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 1
+  data:
+    image: itzg/elasticsearch
+    environment:
+      TYPE: DATA
+      UNICAST_HOSTS: master
+    deploy:
+      replicas: 2
+      update_config:
+        parallelism: 1
+        delay: 60s
+  gateway:
+    image: itzg/elasticsearch
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      TYPE: GATEWAY
+      UNICAST_HOSTS: master
+  kibana:
+    image: kibana
+    ports:
+      - "5601:5601"
+    environment:
+      ELASTICSEARCH_URL: http://gateway:9200

elasticsearch/start

@@ -19,6 +19,11 @@ discoverIpFromLink() {
   OPTS="$OPTS -E $mode.host=$ip"
 }
 
+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 -E network.host=$ips"
+}
+
 setup_clustering() {
 
   if [ -n "$CLUSTER" ]; then
@@ -112,8 +117,13 @@ OPTS="$OPTS \
   -E transport.tcp.port=9300 \
   -E http.port=9200"
 
-discoverIpFromLink $DISCOVER_TRANSPORT_IP transport
-discoverIpFromLink $DISCOVER_HTTP_IP http
+discoverAllGlobalIps
+if [ "${DISCOVER_TRANSPORT_IP}" != "" ]; then
+  discoverIpFromLink $DISCOVER_TRANSPORT_IP transport
+fi
+if [ "${DISCOVER_HTTP_IP}" != "" ]; then
+  discoverIpFromLink $DISCOVER_HTTP_IP http
+fi
 
 setup_personality
 setup_clustering

kibana/Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8u111-jre
 
 MAINTAINER itzg
 
-ENV KIBANA_VERSION 5.1.1
+ENV KIBANA_VERSION 5.1.2
 
 ADD https://artifacts.elastic.co/downloads/kibana/kibana-${KIBANA_VERSION}-linux-x86_64.tar.gz /tmp/kibana.tgz
 

kibana/docker-compose-test.yml

@@ -0,0 +1,12 @@
+version: '2'
+
+services:
+  es:
+    build: ../elasticsearch
+    ports:
+      - "9200:9200"
+
+  kibana:
+    build: .
+    ports:
+      - "5601:5601"

minecraft-server/Dockerfile

@@ -1,30 +1,32 @@
-FROM java:8
+FROM alpine
+
 
 MAINTAINER itzg
 
-ENV APT_GET_UPDATE 2016-04-23
-RUN apt-get update
+RUN echo "http://dl-3.alpinelinux.org/alpine/v3.5/community/" >> /etc/apk/repositories &&\
+        apk update && \
+        apk add \
+          openjdk8-jre-base \
+          openssl \
+          imagemagick \
+          lsof \
+          su-exec \
+          bash \
+          git \
+          jq &&\
+        rm -rf /var/cache/apk/*
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
-  imagemagick \
-  lsof \
-  nano \
-  sudo \
-  vim \
-  jq \
-  && apt-get clean
-
-RUN useradd -s /bin/false --uid 1000 minecraft \
+RUN addgroup -g 1000 minecraft \
+  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
   && mkdir /data \
   && mkdir /config \
   && mkdir /mods \
   && mkdir /plugins \
-  && mkdir /home/minecraft \
   && chown minecraft:minecraft /data /config /mods /plugins /home/minecraft
 
 EXPOSE 25565 25575
 
-ADD https://github.com/itzg/restify/releases/download/1.0.3/restify_linux_amd64 /usr/local/bin/restify
+ADD https://github.com/itzg/restify/releases/download/1.0.4/restify_linux_amd64 /usr/local/bin/restify
 COPY start.sh /start
 COPY start-minecraft.sh /start-minecraft
 COPY mcadmin.jq /usr/share
@@ -38,6 +40,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

@@ -264,6 +264,65 @@ This works well if you want to have a common set of plugins in a separate
 location, but still have multiple worlds with different server requirements
 in either persistent volumes or a downloadable archive.
 
+## Running a Server with a Feed-The-Beast (FTB) modpack
+
+Enable this server mode by adding a `-e TYPE=FTB` to your command-line,
+but note the following additional steps needed...
+
+You need to specify a modpack to run, using the `FTB_SERVER_MOD` environment
+variable. An FTB server modpack is available together with its respective
+client modpack on https://www.feed-the-beast.com under "Additional Files."
+Because of the interactive delayed download mechanism on that web site, you
+must manually download the server modpack. Copy the modpack to the `/data`
+directory (see "Attaching data directory to host filesystem”).
+
+Now you can add a `-e FTB_SERVER_MOD=name_of_modpack.zip` to your command-line.
+
+    $ docker run -d -v /path/on/host:/data -e TYPE=FTB \
+        -e FTB_SERVER_MOD=FTBPresentsSkyfactory3Server_3.0.6.zip \
+        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+
+### Using the /data volume
+
+You must use a persistent `/data` mount for this type of server.
+
+To do this, you will need to attach the container's `/data` directory
+(see "Attaching data directory to host filesystem”).
+
+If the modpack is updated and you want to run the new version on your
+server, you stop and remove the container:
+
+    docker stop mc
+    docker rm mc
+
+Do not erase anything from your /data directory (unless you know of
+specific mods that have been removed from the modpack). Download the
+updated FTB server modpack and copy it to `/data`. Start a new container
+with `FTB_SERVER_MOD` specifying the updated modpack file.
+
+    $ docker run -d -v /path/on/host:/data -e TYPE=FTB \
+        -e FTB_SERVER_MOD=FTBPresentsSkyfactory3Server_3.0.7.zip \
+        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+
+### FTB server JVM options
+
+An FTB server modpack contains its own startup script that launches the
+JVM and it does not use the `JVM_OPTS` environment variable. Instead
+you can use `MIN_RAM` and `MAX_RAM` variables. These are appended to
+the JVM `-Xms` and `-Xmx` options. For example, `-e MIN_RAM=2G` results
+in `-Xms2G` passed to the JVM.
+
+Additionally, `PERMGEN_SIZE` is passed on to `-XX:PermSize`. Here is an
+example:
+
+    $ docker run -d -v /path/on/host:/data -e TYPE=FTB \
+        -e MIN_RAM=1G -e MAX_RAM=2G -e PERMGEN_SIZE=512M \
+        -e FTB_SERVER_MOD=FTBPresentsSkyfactory3Server_3.0.6.zip \
+        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+
+Note: The FTB server start script will also override other options,
+like `MOTD`.
+
 ## Using Docker Compose
 
 Rather than type the server options below, the port mappings above, etc
@@ -549,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
-the setting shown in the example (max and min at 1024 MB):
+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:
 
-    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:
-  ports:
-    - "25565:25565"
+version: '3'
 
-  environment:
-    EULA: "TRUE"
+services:
+  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
-
-  container_name: minecraft-server
-
-  tty: true
-  stdin_open: true
-  restart: always
+volumes:
+  mc:
+  rcon:

minecraft-server/start-minecraft.sh

@@ -23,16 +23,16 @@ VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
 echo "Checking version information."
 case "X$VERSION" in
   X|XLATEST|Xlatest)
-    VANILLA_VERSION=`curl -sSL $VERSIONS_JSON | jq -r '.latest.release'`
+    VANILLA_VERSION=`wget -O - -q $VERSIONS_JSON | jq -r '.latest.release'`
   ;;
   XSNAPSHOT|Xsnapshot)
-    VANILLA_VERSION=`curl -sSL $VERSIONS_JSON | jq -r '.latest.snapshot'`
+    VANILLA_VERSION=`wget -O - -q $VERSIONS_JSON | jq -r '.latest.snapshot'`
   ;;
   X[1-9]*)
     VANILLA_VERSION=$VERSION
   ;;
   *)
-    VANILLA_VERSION=`curl -sSL $VERSIONS_JSON | jq -r '.latest.release'`
+    VANILLA_VERSION=`wget -O - -q $VERSIONS_JSON | jq -r '.latest.release'`
   ;;
 esac
 
@@ -120,7 +120,7 @@ function installForge {
   echo "Checking Forge version information."
   case $FORGEVERSION in
     RECOMMENDED)
-      curl -o /tmp/forge.json -sSL http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
+      wget -q -O /tmp/forge.json -sSL 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 -V | head -1)
   if [[ $norm == '1.7.10' && $sorted == '10.13.2.1300' ]]; then
       # if $FORGEVERSION >= 10.13.2.1300
       normForgeVersion="$norm-$FORGE_VERSION-$norm"
@@ -157,6 +157,44 @@ function installForge {
   fi
 }
 
+function installFTB {
+  TYPE=FEED-THE-BEAST
+
+  echo "Looking for Feed-The-Beast server modpack."
+  if [[ -z $FTB_SERVER_MOD ]]; then
+      echo "Environment variable FTB_SERVER_MOD not set."
+      echo "Set FTB_SERVER_MOD to the file name of the FTB server modpack."
+      echo "(And place the modpack in the /data directory.)"
+      exit 2
+  fi
+  local srv_modpack=${FTB_SERVER_MOD}
+  if [[ ${srv_modpack:0:5} == "data/" ]]; then
+      # Prepend with "/"
+      srv_modpack=/${srv_modpack}
+  fi
+  if [[ ! ${srv_modpack:0:1} == "/" ]]; then
+      # If not an absolute path, assume file is in "/data"
+      srv_modpack=/data/${srv_modpack}
+  fi
+  if [[ ! -f ${srv_modpack} ]]; then
+      echo "FTB server modpack ${srv_modpack} not found."
+      exit 2
+  fi
+  if [[ ! ${srv_modpack: -4} == ".zip" ]]; then
+      echo "FTB server modpack ${srv_modpack} is not a zip archive."
+      echo "Please set FTB_SERVER_MOD to a file with a .zip extension."
+      exit 2
+  fi
+
+  echo "Unpacking FTB server modpack ${srv_modpack} ..."
+  local ftb_dir=/data/FeedTheBeast
+  mkdir -p ${ftb_dir}
+  unzip -u -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}
+}
+
 function installVanilla {
   SERVER="minecraft_server.$VANILLA_VERSION.jar"
 
@@ -203,6 +241,11 @@ case "$TYPE" in
     installForge
   ;;
 
+  FTB|ftb)
+    TYPE=FEED-THE-BEAST
+    installFTB
+  ;;
+
   VANILLA|vanilla)
     installVanilla
   ;;
@@ -320,7 +363,7 @@ if [ ! -e server.properties ]; then
 
   if [ -n "$LEVEL_TYPE" ]; then
     # normalize to uppercase
-    LEVEL_TYPE=${LEVEL_TYPE^^}
+    LEVEL_TYPE=$( echo ${LEVEL_TYPE} | tr '[:lower:]' '[:upper:]' )
     echo "Setting level type to $LEVEL_TYPE"
     # check for valid values and only then set
     case $LEVEL_TYPE in
@@ -359,7 +402,8 @@ if [ ! -e server.properties ]; then
 
   if [ -n "$MODE" ]; then
     echo "Setting mode"
-    case ${MODE,,?} in
+    MODE_LC=$( echo $MODE | tr '[:upper:]' '[:lower:]' )
+    case $MODE_LC in
       0|1|2|3)
         ;;
       su*)
@@ -447,10 +491,20 @@ 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 "$@" $EXTRA_ARGS < /data/bootstrap.txt
-else
-    exec java $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
+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}
+else
+    # If we have a bootstrap.txt file... feed that in to the server stdin
+    if [ -f /data/bootstrap.txt ];
+    then
+        exec java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS < /data/bootstrap.txt
+    else
+        exec java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
+    fi
 fi

minecraft-server/start.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 
 set -e
-usermod --uid $UID minecraft
-groupmod --gid $GID minecraft
+sed -i "/^minecraft/s/1000/${UID}/g" /etc/passwd
+sed -i "/^minecraft/s/1000/${GID}/g" /etc/group
 
 if [ "$SKIP_OWNERSHIP_FIX" != "TRUE" ]; then
   fix_ownership() {
     dir=$1
-    if ! sudo -u minecraft test -w $dir; then
+    if ! su-exec minecraft test -w $dir; then
       echo "Correcting writability of $dir ..."
       chown -R minecraft:minecraft $dir
       chmod -R u+w $dir
@@ -19,4 +19,4 @@ if [ "$SKIP_OWNERSHIP_FIX" != "TRUE" ]; then
 fi
 
 echo "Switching to user 'minecraft'"
-exec sudo -E -u minecraft /start-minecraft "$@"
+su-exec minecraft /start-minecraft $@