[es] upgrade 2.4.x to 2.4.3

2026-02-17 15:13:55 +00:00 · 2016-12-28 13:38:44 -06:00
55 changed files with 746 additions and 1858 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,17 +0,0 @@
-version: 2
-jobs:
-  minecraft_server:
-    docker:
-      - image: circleci/buildpack-deps:18.04
-    steps:
-      - checkout
-      - setup_remote_docker
-      - run:
-          name: Build image
-          command: docker build -t mc:$CIRCLE_BUILD_NUM minecraft-server
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - minecraft_server
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-indent_style = space
--- a/README.md
+++ b/README.md
@@ -1,10 +1,6 @@
+dockerfiles
+===========

-This repository contains the various Dockerfile definitions I'm maintaining.
+Contains the various Dockerfile definitions I'm maintaining.

 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/itzg/dockerfiles?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-### Images that are discontinued
-
-##### Cassandra
-
-I have found the [official image](https://hub.docker.com/_/cassandra/) to be quite sufficient
--- a/2
+++ b/2
@@ -5,8 +5,10 @@ pkgs="$pkgs minecraft-server"
 pkgs="$pkgs elasticsearch"
 pkgs="$pkgs kibana"
 pkgs="$pkgs titan-gremlin"
+pkgs="$pkgs cassandra"

 for p in $pkgs
 do
  docker build -t itzg/$p $p
 done
+
--- a/cassandra/Dockerfile
+++ b/cassandra/Dockerfile
@@ -0,0 +1,26 @@
+FROM java:openjdk-8u72-jdk
+
+MAINTAINER itzg
+
+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 && \
+  rm /tmp/apache-cassandra.tgz
+
+
+RUN mv /opt/apache-cassandra-$CASSANDRA_VERSION /opt/cassandra
+ENV CASSANDRA_HOME /opt/cassandra
+ENV CASSANDRA_CONF /conf
+ENV CASSANDRA_DATA /data
+WORKDIR $CASSANDRA_HOME
+
+RUN ln -s $CASSANDRA_HOME/bin/* /usr/local/bin
+VOLUME ["/data","/conf"]
+
+EXPOSE 9042 9160 7000 7001
+
+ADD cassandra.in.sh $CASSANDRA_HOME/cassandra.in.sh
+RUN mv $CASSANDRA_HOME/bin/cassandra.in.sh $CASSANDRA_HOME/bin/orig.cassandra.in.sh
+
+CMD ["/opt/cassandra/bin/cassandra", "-f"]
--- a/cassandra/README.md
+++ b/cassandra/README.md
@@ -0,0 +1,9 @@
+Yet another Cassandra image, but this one got container and non-container access right.
+
+# Basic Usage
+
+To support access from both Docker containers and external, non-Docker clients:
+
+    docker run -d --name cassandra -e PUBLISH_AS=192.168.59.103 -p 9160:9160 itzg/cassandra
+
+replacing `192.168.59.103` with your Docker host's LAN IP address.
--- a/cassandra/cassandra.in.sh
+++ b/cassandra/cassandra.in.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+cassYml=$CASSANDRA_HOME/conf/cassandra.yaml
+
+privateAddr=$(hostname -i)
+
+seeds=${SEEDS:-${PUBLISH_AS:-$privateAddr}}
+
+sed -i -e "s/- seeds:.*/- seeds: \"$seeds\"/" \
+  -e "s/listen_address:.*/listen_address: $privateAddr/" \
+  -e "s/rpc_address:.*/rpc_address: $privateAddr/" \
+  -e "s/start_rpc:.*/start_rpc: true/" \
+  -e "s#- /var/lib/cassandra/data#- $CASSANDRA_DATA#" \
+  $cassYml
+
+if [ -n "$PUBLISH_AS" ]; then
+  sed -i -e "s/\(\s*#\)\?\s*broadcast_address:.*/broadcast_address: $PUBLISH_AS/" $cassYml
+fi
+
+# Copy over our tweaked files, but non-clobbering to let user have ultimate control
+cp -rn $CASSANDRA_HOME/conf/* $CASSANDRA_CONF
+
+# source the original
+. $CASSANDRA_HOME/bin/orig.cassandra.in.sh
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,39 +1,26 @@
-FROM openjdk:8u121-jre-alpine
+FROM java:8u111-jre-alpine

-LABEL maintainer "itzg"
+MAINTAINER itzg

-RUN apk -U add bash
+ENV ES_VERSION=2.4.3

-ARG ES_VERSION=5.5.2
-# avoid conflicts with debian host systems when mounting to host volume
-ARG DEFAULT_ES_USER_UID=1100
-
-ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp
-# need to adapt to both Docker's new remote-unpack-ADD behavior and the old behavior
+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 && \
-  if [ -f /tmp/elasticsearch-$ES_VERSION.tar.gz ]; then \
-    tar xf /tmp/elasticsearch-$ES_VERSION.tar.gz; \
-    else mv /tmp/elasticsearch-${ES_VERSION} /usr/share; \
-    fi && \
-  rm -f /tmp/elasticsearch-$ES_VERSION.tar.gz
+  tar xf /tmp/es.tgz && \
+  rm /tmp/es.tgz
+
+COPY start /start

 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 \
-    DEFAULT_ES_USER_UID=$DEFAULT_ES_USER_UID \
-    ES_JAVA_OPTS="-Xms1g -Xmx1g"
+    OPTS=-Dnetwork.host=_non_loopback_ \
+    DEFAULT_ES_USER=elasticsearch

-RUN adduser -S -s /bin/sh -u $DEFAULT_ES_USER_UID $DEFAULT_ES_USER
+RUN adduser -S -s /bin/sh $DEFAULT_ES_USER

 VOLUME ["/data","/conf"]

 WORKDIR $ES_HOME

-COPY java.policy /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/
-COPY start /start
-COPY log4j2.properties $ES_HOME/config/
-
 CMD ["/start"]
--- a/elasticsearch/README.md
+++ b/elasticsearch/README.md
@@ -1,10 +1,5 @@
 This Docker image provides an easily configurable Elasticsearch node. Via port mappings, it is easy to create an arbitrarily sized cluster of nodes. As long as the versions match, you can mix-and-match "real" Elasticsearch nodes with container-ized ones.

-# NOTE for use on Linux hosts
-
-Elasticsearch 5.x requires that the virtual memory mmap count is set sufficiently for stable,
-production use. [Refer to this guide for more information](https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html).
-
 # Basic Usage

 To start an Elasticsearch data node that listens on the standard ports on your host's network interface:
@@ -34,9 +29,9 @@ Where `DOCKERHOST` would be the actual hostname of your host running Docker.

 To run a multi-node cluster (3-node in this example) on a single Docker machine use:

-    docker run -d --name es0 -p 9200:9200                    itzg/elasticsearch
-    docker run -d --name es1 --link es0 -e UNICAST_HOSTS=es0 itzg/elasticsearch
-    docker run -d --name es2 --link es0 -e UNICAST_HOSTS=es0 itzg/elasticsearch
+    docker run -d --name es0 -p 9200:9200                    es
+    docker run -d --name es1 --link es0 -e UNICAST_HOSTS=es0 es
+    docker run -d --name es2 --link es0 -e UNICAST_HOSTS=es0 es


 and then check the cluster health, such as http://192.168.99.100:9200/_cluster/health?pretty
@@ -54,40 +49,6 @@ 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
@@ -181,14 +142,12 @@ 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 eligible
+* `GATEWAY` : only operates as a client node or a "smart router". These are the ones whose HTTP port 9200 will need to be exposed

 A [Docker Compose](https://docs.docker.com/compose/overview/) file will serve as a good example of these three node types:

 ```
-version: '3'
+version: '2'

 services:
  gateway:
@@ -211,14 +170,6 @@ services:
    environment:
      UNICAST_HOSTS: master,gateway
      TYPE: DATA
-
-  kibana:
-    image: kibana
-    ports:
-      - "5601:5601"
-    environment:
-      ELASTICSEARCH_URL: http://gateway:9200
-
 ```

 ## Minimum Master Nodes
@@ -231,28 +182,18 @@ Using the Docker Compose file above, a value of `2` is appropriate when scaling

    docker-compose scale master=3

-## Multiple Network Binding, such as Swarm Mode
+## Auto transport/http discovery with Swarm Mode

-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`.
+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_`.

-That discovery can be overridden by providing a specific ethernet device name
-to `DISCOVER_TRANSPORT_IP` and/or `DISCOVER_HTTP_IP`, such as
+To resolve this, add

    -e DISCOVER_TRANSPORT_IP=eth0
-    -e DISCOVER_HTTP_IP=eth2

-## Heap size and other JVM options
+replacing `eth0` with another interface within the container, if needed.

-By default this image will run Elasticsearch with a Java heap size of 1 GB. If that value
-or any other JVM options need to be adjusted, then replace the `ES_JAVA_OPTS`
-environment variable.
+The same can be done for publish/binding of the http module by adding:

-For example, this would allow for the use of 16 GB of heap:
-
-    -e ES_JAVA_OPTS="-Xms16g -Xmx16g"
-
-Refer to [this page](https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html)
-for more information about why both the minimum and maximum sizes were set to
-the same value.
+    -e DISCOVERY_HTTP_IP=eth2
--- a/elasticsearch/docker-compose-3x1GB.yml
+++ b/elasticsearch/docker-compose-3x1GB.yml
@@ -1,35 +0,0 @@
-# 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
-      TYPE: NON_DATA
-    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
--- a/elasticsearch/docker-compose-localbuild.yml
+++ b/elasticsearch/docker-compose-localbuild.yml
@@ -1,35 +0,0 @@
-version: '3'
-
-services:
-  master:
-    build: .
-    environment:
-      TYPE: MASTER
-      UNICAST_HOSTS: master
-      MIN_MASTERS: 1
-  data:
-    build: .
-    environment:
-      TYPE: DATA
-      UNICAST_HOSTS: master
-  gateway:
-    build: .
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    environment:
-      TYPE: GATEWAY
-      UNICAST_HOSTS: master
-  ingest:
-    build: .
-    ports:
-      - "9222:9200"
-    environment:
-      TYPE: INGEST
-      UNICAST_HOSTS: master
-  kibana:
-    image: kibana:5.5.1
-    ports:
-      - "5601:5601"
-    environment:
-      ELASTICSEARCH_URL: http://gateway:9200
--- a/elasticsearch/docker-compose-min.yml
+++ b/elasticsearch/docker-compose-min.yml
@@ -1,21 +0,0 @@
-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
--- a/elasticsearch/docker-compose.yml
+++ b/elasticsearch/docker-compose.yml
@@ -1,44 +0,0 @@
-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
-  ingest:
-    image: itzg/elasticsearch
-    ports:
-      - "9222:9200"
-    environment:
-      TYPE: INGEST
-      UNICAST_HOSTS: master
-  kibana:
-    image: kibana
-    ports:
-      - "5601:5601"
-    environment:
-      ELASTICSEARCH_URL: http://gateway:9200
--- a/elasticsearch/java.policy
+++ b/elasticsearch/java.policy
@@ -1,6 +0,0 @@
-grant {
-  // JMX Java Management eXtensions
-  permission javax.management.MBeanTrustPermission "register";
-  permission javax.management.MBeanServerPermission "createMBeanServer";
-  permission javax.management.MBeanPermission "-#-[-]", "queryNames";
-};
--- a/elasticsearch/log4j2.properties
+++ b/elasticsearch/log4j2.properties
@@ -1,74 +0,0 @@
-status = error
-
-# log action execution errors for easier debugging
-logger.action.name = org.elasticsearch.action
-logger.action.level = debug
-
-appender.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
-
-appender.rolling.type = RollingFile
-appender.rolling.name = rolling
-appender.rolling.fileName = ${sys:es.logs}.log
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%.10000m%n
-appender.rolling.filePattern = ${sys:es.logs}-%d{yyyy-MM-dd}.log
-appender.rolling.policies.type = Policies
-appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.rolling.policies.time.interval = 1
-appender.rolling.policies.time.modulate = true
-
-rootLogger.level = info
-rootLogger.appenderRef.console.ref = console
-#rootLogger.appenderRef.rolling.ref = rolling
-
-appender.deprecation_rolling.type = RollingFile
-appender.deprecation_rolling.name = deprecation_rolling
-appender.deprecation_rolling.fileName = ${sys:es.logs}_deprecation.log
-appender.deprecation_rolling.layout.type = PatternLayout
-appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%.10000m%n
-appender.deprecation_rolling.filePattern = ${sys:es.logs}_deprecation-%i.log.gz
-appender.deprecation_rolling.policies.type = Policies
-appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.deprecation_rolling.policies.size.size = 1GB
-appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy
-appender.deprecation_rolling.strategy.max = 4
-
-logger.deprecation.name = org.elasticsearch.deprecation
-logger.deprecation.level = warn
-#logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_rolling
-logger.deprecation.additivity = false
-
-appender.index_search_slowlog_rolling.type = RollingFile
-appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
-appender.index_search_slowlog_rolling.fileName = ${sys:es.logs}_index_search_slowlog.log
-appender.index_search_slowlog_rolling.layout.type = PatternLayout
-appender.index_search_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %marker%.10000m%n
-appender.index_search_slowlog_rolling.filePattern = ${sys:es.logs}_index_search_slowlog-%d{yyyy-MM-dd}.log
-appender.index_search_slowlog_rolling.policies.type = Policies
-appender.index_search_slowlog_rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.index_search_slowlog_rolling.policies.time.interval = 1
-appender.index_search_slowlog_rolling.policies.time.modulate = true
-
-logger.index_search_slowlog_rolling.name = index.search.slowlog
-logger.index_search_slowlog_rolling.level = trace
-logger.index_search_slowlog_rolling.appenderRef.index_search_slowlog_rolling.ref = console
-logger.index_search_slowlog_rolling.additivity = false
-
-appender.index_indexing_slowlog_rolling.type = RollingFile
-appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
-appender.index_indexing_slowlog_rolling.fileName = ${sys:es.logs}_index_indexing_slowlog.log
-appender.index_indexing_slowlog_rolling.layout.type = PatternLayout
-appender.index_indexing_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] %marker%.10000m%n
-appender.index_indexing_slowlog_rolling.filePattern = ${sys:es.logs}_index_indexing_slowlog-%d{yyyy-MM-dd}.log
-appender.index_indexing_slowlog_rolling.policies.type = Policies
-appender.index_indexing_slowlog_rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.index_indexing_slowlog_rolling.policies.time.interval = 1
-appender.index_indexing_slowlog_rolling.policies.time.modulate = true
-
-logger.index_indexing_slowlog.name = index.indexing.slowlog.index
-logger.index_indexing_slowlog.level = trace
-logger.index_indexing_slowlog.appenderRef.index_indexing_slowlog_rolling.ref = console
-logger.index_indexing_slowlog.additivity = false
--- a/elasticsearch/start
+++ b/elasticsearch/start
@@ -1,126 +1,5 @@
 #!/bin/sh

-pre_checks() {
-  mmc=$(sysctl vm.max_map_count|sed 's/.*= //')
-  if [[ $mmc -lt 262144 ]]; then
-    echo "
-ERROR: As of 5.0.0 Elasticsearch requires increasing mmap counts.
-Refer to https://www.elastic.co/guide/en/elasticsearch/reference/current/vm-max-map-count.html
-"
-    exit 1
-  fi
-}
-
-discoverIpFromLink() {
-  dev=$1
-  mode=$2
-  ip=`ipaddr show dev $dev scope global|awk '$1 == "inet" { if (!match($2,"/32")) { gsub("/.*","",$2) ; print $2 } }'`
-  echo "Discovered $mode address $ip for $dev"
-  OPTS="$OPTS -E $mode.host=$ip"
-}
-
-discoverAllGlobalIps() {
-  if [ ${#IGNORE_NETWORK} -eq 0 ]
-  then
-    IGNORE_NETWORK='999.999.999.999'
-  fi
-  printf "Finding IPs"
-  while [ ${#ips} -eq 0 ]
-  do
-    printf "."
-    ips=`ipaddr show scope global| grep -v "inet ${IGNORE_NETWORK}" | 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] } }'`
-    sleep 1
-  done
-  echo " found! $ips"
-  OPTS="$OPTS -E network.host=$ips"
-}
-
-setup_clustering() {
-
-  if [ -n "$CLUSTER" ]; then
-    OPTS="$OPTS -E cluster.name=$CLUSTER"
-    if [ -n "$CLUSTER_FROM" ]; then
-      if [ -d /data/$CLUSTER_FROM -a ! -d /data/$CLUSTER ]; then
-        echo "Performing cluster data migration from $CLUSTER_FROM to $CLUSTER"
-        mv /data/$CLUSTER_FROM /data/$CLUSTER
-      fi
-    fi
-  fi
-
-  if [ -n "$NODE_NAME" ]; then
-    OPTS="$OPTS -E node.name=$NODE_NAME"
-  fi
-
-  if [ -n "$MULTICAST" ]; then
-    OPTS="$OPTS -E discovery.zen.ping.multicast.enabled=$MULTICAST"
-  fi
-
-  if [ -n "$UNICAST_HOSTS" ]; then
-    OPTS="$OPTS -E discovery.zen.ping.unicast.hosts=$UNICAST_HOSTS"
-  fi
-
-  if [ -n "$PUBLISH_AS" ]; then
-    OPTS="$OPTS -E transport.publish_host=$(echo $PUBLISH_AS | awk -F: '{print $1}')"
-    OPTS="$OPTS -E transport.publish_port=$(echo $PUBLISH_AS | awk -F: '{if ($2) print $2; else print 9300}')"
-  fi
-
-  if [ -n "$MIN_MASTERS" ]; then
-    OPTS="$OPTS -E discovery.zen.minimum_master_nodes=$MIN_MASTERS"
-  fi
-
-}
-
-install_plugins() {
-
-  if [ -n "$PLUGINS" ]; then
-    for p in $(echo $PLUGINS | awk -v RS=, '{print}')
-    do
-      echo "Installing the plugin $p"
-      $ES_HOME/bin/elasticsearch-plugin install $p
-    done
-  else
-    mkdir -p $ES_HOME/plugins
-  fi
-}
-
-setup_personality() {
-
-  if [ -n "$TYPE" ]; then
-    case $TYPE in
-      MASTER)
-        OPTS="$OPTS -E node.master=true -E node.data=false -E node.ingest=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)
-        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
-    esac
-  fi
-
-}
-
-pre_checks
-
 if [ -f /conf/env ]; then
  . /conf/env
 fi
@@ -129,28 +8,95 @@ if [ ! -e /conf/elasticsearch.* ]; then
  cp $ES_HOME/config/elasticsearch.yml /conf
 fi

-if [ ! -e /conf/log4j2.properties ]; then
-  cp $ES_HOME/config/log4j2.properties /conf
+if [ ! -e /conf/logging.* ]; then
+  cp $ES_HOME/config/logging.yml /conf
 fi

-OPTS="$OPTS \
-  -E path.conf=/conf \
-  -E path.data=/data \
-  -E path.logs=/data \
-  -E transport.tcp.port=9300 \
-  -E http.port=9200"
+OPTS="$OPTS -Des.path.conf=/conf \
+  -Des.path.data=/data \
+  -Des.path.logs=/data \
+  -Des.transport.tcp.port=9300 \
+  -Des.http.port=9200"

-discoverAllGlobalIps
-if [ "${DISCOVER_TRANSPORT_IP}" != "" ]; then
+discoverIpFromLink() {
+  dev=$1
+  mode=$2
+  ip=`ipaddr show dev $dev scope global|awk '$1 == "inet" { if (!match($2,"/32")) { gsub("/.*","",$2) ; print $2 } }'`
+  echo "Discovered $mode address $ip for $dev"
+  OPTS="$OPTS -Des.$mode.host=$ip"
+}
+
+if [ "$DISCOVER_TRANSPORT_IP" != "" ]; then
  discoverIpFromLink $DISCOVER_TRANSPORT_IP transport
 fi
-if [ "${DISCOVER_HTTP_IP}" != "" ]; then
+if [ "$DISCOVER_HTTP_IP" != "" ]; then
  discoverIpFromLink $DISCOVER_HTTP_IP http
 fi

-setup_personality
-setup_clustering
-install_plugins
+if [ -n "$CLUSTER" ]; then
+  OPTS="$OPTS -Des.cluster.name=$CLUSTER"
+  if [ -n "$CLUSTER_FROM" ]; then
+    if [ -d /data/$CLUSTER_FROM -a ! -d /data/$CLUSTER ]; then
+      echo "Performing cluster data migration from $CLUSTER_FROM to $CLUSTER"
+      mv /data/$CLUSTER_FROM /data/$CLUSTER
+    fi
+  fi
+fi
+
+if [ -n "$NODE_NAME" ]; then
+  OPTS="$OPTS -Des.node.name=$NODE_NAME"
+fi
+
+if [ -n "$MULTICAST" ]; then
+  OPTS="$OPTS -Des.discovery.zen.ping.multicast.enabled=$MULTICAST"
+fi
+
+if [ -n "$UNICAST_HOSTS" ]; then
+  OPTS="$OPTS -Des.discovery.zen.ping.unicast.hosts=$UNICAST_HOSTS"
+fi
+
+if [ -n "$PUBLISH_AS" ]; then
+  OPTS="$OPTS -Des.transport.publish_host=$(echo $PUBLISH_AS | awk -F: '{print $1}')"
+  OPTS="$OPTS -Des.transport.publish_port=$(echo $PUBLISH_AS | awk -F: '{if ($2) print $2; else print 9300}')"
+fi
+
+if [ -n "$TYPE" ]; then
+  case $TYPE in
+    MASTER)
+      OPTS="$OPTS --node.master=true --node.data=false"
+      ;;
+
+    GATEWAY)
+      OPTS="$OPTS --node.master=false --node.data=false"
+      ;;
+
+    DATA|NON_MASTER)
+      OPTS="$OPTS --node.master=false --node.data=true"
+      ;;
+
+    *)
+      echo "Unknown node type. Please use MASTER|GATEWAY|DATA|NON_MASTER"
+      exit 1
+  esac
+fi
+
+if [ -n "$MIN_MASTERS" ]; then
+  OPTS="$OPTS --discovery.zen.minimum_master_nodes=$MIN_MASTERS"
+fi
+
+mkdir -p /conf/plugins
+OPTS="$OPTS --path.plugins=/conf/plugins"
+
+if [ -n "$PLUGINS" ]; then
+  PLUGIN_OPTS="-Des.path.conf=/conf -Des.path.plugins=/conf/plugins"
+  for p in $(echo $PLUGINS | awk -v RS=, '{print}')
+  do
+    echo "Installing the plugin $p"
+    $ES_HOME/bin/plugin $PLUGIN_OPTS install $p -t 1m -b
+  done
+else
+  mkdir -p /conf/plugins
+fi

 mkdir -p /conf/scripts

@@ -158,7 +104,8 @@ echo "Starting Elasticsearch with the options $OPTS"
 CMD="$ES_HOME/bin/elasticsearch $OPTS"
 if [ `id -u` = 0 ]; then
  echo "Running as non-root..."
-  chown -R $DEFAULT_ES_USER /data /conf
+  chown -R $DEFAULT_ES_USER /data
+  set -x
  su -c "$CMD" $DEFAULT_ES_USER
 else
  $CMD
--- a/gitblit/Dockerfile
+++ b/gitblit/Dockerfile
@@ -1,18 +1,18 @@
 FROM java:8
-
-LABEL maintainer "itzg"
+ 
+MAINTAINER itzg

 ENV GITBLIT_VERSION 1.7.1
-
+ 
 RUN wget -qO /tmp/gitblit.tgz http://dl.bintray.com/gitblit/releases/gitblit-$GITBLIT_VERSION.tar.gz
-
+ 
 RUN tar -C /opt -xvf /tmp/gitblit.tgz && \
    rm /tmp/gitblit.tgz
-
+ 
 VOLUME ["/data"]
-
+ 
 ADD start.sh /start
-
+ 
 ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \
    GITBLIT_HTTPS_PORT=443 \
    GITBLIT_HTTP_PORT=80 \
@@ -20,7 +20,7 @@ ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \
    GITBLIT_ADMIN_USER=admin \
    GITBLIT_INITIAL_REPO=
 WORKDIR $GITBLIT_PATH
-
+ 
 EXPOSE 80 443
-
+ 
 ENTRYPOINT ["/start"]
--- a/gvm/Dockerfile
+++ b/gvm/Dockerfile
@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7

-LABEL maintainer "itzg"
+MAINTAINER itzg

 RUN apt-get install -y curl unzip

--- a/jekyll-github-pages/Dockerfile
+++ b/jekyll-github-pages/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:trusty

-LABEL maintainer "itzg"
+MAINTAINER itzg

 ENV APT_GET_UPDATE 2014-09-18

@@ -21,3 +21,4 @@ EXPOSE 4000

 ADD start.sh /start
 CMD ["/start"]
+
--- a/jenkins/Dockerfile
+++ b/jenkins/Dockerfile
@@ -1,17 +1,12 @@
-FROM java:openjdk-8u102-jdk
+FROM java:openjdk-8u72-jdk

-LABEL maintainer "itzg"
+MAINTAINER itzg

-RUN apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y \
-  graphviz \
-  && apt-get clean
+ADD download-and-start.sh /download-and-start

 ENV JENKINS_HOME=/data

 VOLUME ["/data", "/root", "/opt/jenkins"]
 EXPOSE 8080 38252

-COPY download-and-start.sh /opt/download-and-start
-
-CMD ["/opt/download-and-start"]
+CMD ["/download-and-start"]
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,14 +1,13 @@
-FROM openjdk:8u111-jre
+FROM itzg/ubuntu-openjdk-7

-LABEL maintainer "itzg"
+MAINTAINER itzg

-ENV KIBANA_VERSION 5.1.2
+ENV KIBANA_VERSION 4.1.1

-ADD https://artifacts.elastic.co/downloads/kibana/kibana-${KIBANA_VERSION}-linux-x86_64.tar.gz /tmp/kibana.tgz
+RUN wget -q -O /tmp/kibana.tgz https://download.elasticsearch.org/kibana/kibana/kibana-${KIBANA_VERSION}-linux-x64.tar.gz

 RUN tar -C /opt -xzf /tmp/kibana.tgz && rm /tmp/kibana.tgz
-
-ENV KIBANA_HOME /opt/kibana-$KIBANA_VERSION-linux-x86_64
+ENV KIBANA_HOME /opt/kibana-$KIBANA_VERSION-linux-x64

 # Simplify for cross-container
 ENV ES_URL http://es:9200
--- a/kibana/docker-compose-test.yml
+++ b/kibana/docker-compose-test.yml
@@ -1,12 +0,0 @@
-version: '2'
-
-services:
-  es:
-    build: ../elasticsearch
-    ports:
-      - "9200:9200"
-
-  kibana:
-    build: .
-    ports:
-      - "5601:5601"
--- a/kibana/start.sh
+++ b/kibana/start.sh
@@ -1,5 +1,6 @@
-#!/bin/sh
+#!/bin/bash

-OPTS="-e $ES_URL -H $HOSTNAME"
+OPTS="-e $ES_URL"

 exec bin/kibana $OPTS
+
--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7

-LABEL maintainer "itzg"
+MAINTAINER itzg

 ENV LOGSTASH_VERSION 1.5.0-1

--- a/minecraft-server/.editorconfig
+++ b/minecraft-server/.editorconfig
@@ -1,2 +0,0 @@
-[start-*]
-indent_size = 2
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -1,61 +1,43 @@
-FROM openjdk:8u171-jre-alpine
+FROM java:8

-LABEL maintainer "itzg"
+MAINTAINER itzg

-RUN apk add --no-cache -U \
-          openssl \
-          imagemagick \
-          lsof \
-          su-exec \
-          shadow \
-          bash \
-          curl iputils wget \
-          git \
-          jq \
-          mysql-client \
-          python python-dev py2-pip
+ENV APT_GET_UPDATE 2016-04-23
+RUN apt-get update

-RUN pip install mcstatus
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
+  imagemagick \
+  lsof \
+  nano \
+  sudo \
+  vim \
+  jq \
+  && apt-get clean

-HEALTHCHECK CMD mcstatus localhost:$SERVER_PORT ping
-
-RUN addgroup -g 1000 minecraft \
-  && adduser -Ss /bin/false -u 1000 -G minecraft -h /home/minecraft minecraft \
-  && mkdir -m 777 /data /mods /config /plugins \
+RUN useradd -s /bin/false --uid 1000 minecraft \
+  && mkdir /data \
+  && mkdir /config \
+  && mkdir /mods \
+  && mkdir /plugins \
+  && mkdir /home/minecraft \
  && chown minecraft:minecraft /data /config /mods /plugins /home/minecraft

 EXPOSE 25565 25575

-ARG RESTIFY_VER=1.1.4
-ARG RCON_CLI_VER=1.4.0
-ARG MC_SERVER_RUNNER_VER=1.2.0
-ARG ARCH=amd64
-
-ADD https://github.com/itzg/restify/releases/download/${RESTIFY_VER}/restify_${RESTIFY_VER}_linux_${ARCH}.tar.gz /tmp/restify.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/restify.tgz restify && \
-  rm /tmp/restify.tgz
-
-ADD https://github.com/itzg/rcon-cli/releases/download/${RCON_CLI_VER}/rcon-cli_${RCON_CLI_VER}_linux_${ARCH}.tar.gz /tmp/rcon-cli.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/rcon-cli.tgz rcon-cli && \
-  rm /tmp/rcon-cli.tgz
-
-ADD https://github.com/itzg/mc-server-runner/releases/download/${MC_SERVER_RUNNER_VER}/mc-server-runner_${MC_SERVER_RUNNER_VER}_linux_${ARCH}.tar.gz /tmp/mc-server-runner.tgz
-RUN tar -x -C /usr/local/bin -f /tmp/mc-server-runner.tgz mc-server-runner && \
-  rm /tmp/mc-server-runner.tgz
-
+ADD https://github.com/itzg/restify/releases/download/1.0.3/restify_linux_amd64 /usr/local/bin/restify
+COPY start.sh /start
+COPY start-minecraft.sh /start-minecraft
 COPY mcadmin.jq /usr/share
 RUN chmod +x /usr/local/bin/*

-VOLUME ["/data","/mods","/config","/plugins"]
+VOLUME ["/data","/mods","/config","/plugins","/home/minecraft"]
 COPY server.properties /tmp/server.properties
 WORKDIR /data

 ENTRYPOINT [ "/start" ]

 ENV UID=1000 GID=1000 \
-    JVM_XX_OPTS="-XX:+UseG1GC" MEMORY="1G" \
-    TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED SPONGEBRANCH=STABLE SPONGEVERSION= LEVEL=world \
-    PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-    LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true
-
-COPY start* /
+    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 CONSOLE=true
--- a/minecraft-server/Minecraft
+++ b/minecraft-server/Minecraft
@@ -1 +0,0 @@
-<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.110 Safari/537.36" version="6.4.4" editor="www.draw.io" type="github"><diagram name="Page-1">1VVNc5swEP01HDMDUiDOMbGd5pK2Ux96VkGAxgJRIRvcX9+VWD40ODOZ1j0Uz9jS2w+t3ts1Ad1W/SfNmvJNZVwGJMz6gO4CQjZRCN8WuAxA8vgwAIUW2QBFM3AQvziCGFecRMZbz9EoJY1ofDBVdc1T42FMa9X5brmS/qkNK/gKOKRMrtHvIjMlolEYzoZXLooSj97EaPjB0mOh1anG8wJCc/cM5oqNudC/LVmmugVE9wHdaqXMsKr6LZeW2pG2Ie7lHetUt+a1+UgAGQLOTJ74WHEiIfQ5E2dbn7kgJ8nPky3q2fDe3DEpijqgT+AheW5mK6wK/HVZ2obVI7ZT6ZFrCHlVrRkdoLSlzwJ2BYwo8WohXSkMPzQstfsOWhCcSlNJ2EX21JFVu8mFlFsllXahdJ/YD+Bnro0AyZ+Gu+yMslnwZjt3LVd/KurCpgptLlWbA5aBXNs0vH+X/mgSFWaFq4obfQEXDKDYBhd/2809RzeIlYt2mxwZ9nkxZZ61hgXKfV16upK+EjBMmuXmruX67KSCATMMYL2SwDU5z5DkvxAE52NNvdHqyBeOoXs8UWIbplP8A3ES3UCVja/K41oVEl5RJYpuoMr9SpU34B+Qr0rD0ITD0JE4TuI/nopwLcKLexYi6OFet6CT3Pt8TjwtCI3IFUJv0eXxis9v2y+fr/D58P/yGf87PmE7v4ycbfHCp/vf</diagram></mxfile>
--- a/minecraft-server/README.md
+++ b/minecraft-server/README.md
@@ -1,7 +1,6 @@

 [![Docker Pulls](https://img.shields.io/docker/pulls/itzg/minecraft-server.svg)](https://hub.docker.com/r/itzg/minecraft-server/)
 [![Docker Stars](https://img.shields.io/docker/stars/itzg/minecraft-server.svg?maxAge=2592000)](https://hub.docker.com/r/itzg/minecraft-server/)
-[![GitHub Issues](https://img.shields.io/github/issues-raw/itzg/dockerfiles.svg)](https://github.com/itzg/dockerfiles/issues)

 This docker image provides a Minecraft Server that will automatically download the latest stable
 version at startup. You can also run/upgrade to any specific version or the
@@ -36,24 +35,6 @@ With that you can easily view the logs, stop, or re-start the container:

 ## Interacting with the server

-[RCON](http://wiki.vg/RCON) is enabled by default, so you can `exec` into the container to
-access the Minecraft server console:
-
-```
-docker exec -i mc rcon-cli
-```
-
-Note: The `-i` is required for interactive use of rcon-cli.
-
-To run a simple, one-shot command, such as stopping a Minecraft server, pass the command as
-arguments to `rcon-cli`, such as:
-
-```
-docker exec mc rcon-cli stop
-```
-
-_The `-i` is not needed in this case._
-
 In order to attach and interact with the Minecraft server, add `-it` when starting the container, such as

    docker run -d -it -p 25565:25565 --name mc itzg/minecraft-server
@@ -91,6 +72,17 @@ to map a directory on your host machine to the container's `/data` directory, su
 When attached in this way you can stop the server, edit the configuration under your attached `/path/on/host`
 and start the server again with `docker start CONTAINERID` to pick up the new configuration.

+**NOTE**: By default, the files in the attached directory will be owned by the host user with UID of 1000 and host group with GID of 1000.
+You can use an different UID and GID by passing the options:
+
+    -e UID=1000 -e GID=1000
+
+replacing 1000 with a UID and GID that is present on the host.
+Here is one way to find the UID and GID:
+
+    id some_host_user
+    getent group some_host_group
+
 ## Versions

 To use a different Minecraft version, pass the `VERSION` environment variable, which can have the value
@@ -107,34 +99,6 @@ or a specific version:

    docker run -d -e VERSION=1.7.9 ...

-## Healthcheck
-
-This image contains [Dinnerbone's mcstatus](https://github.com/Dinnerbone/mcstatus) and uses
-its `ping` command to continually check on the container's. That can be observed
-from the `STATUS` column of `docker ps`
-
-```
-CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS                    PORTS                                 NAMES
-b418af073764        mc                  "/start"            43 seconds ago      Up 41 seconds (healthy)   0.0.0.0:25565->25565/tcp, 25575/tcp   mc
-```
-
-You can also query the container's health in a script friendly way:
-
-```
-> docker container inspect -f "{{.State.Health.Status}}" mc
-healthy
-```
-
-Finally, since `mcstatus` is on the `PATH` you can exec into the container
-and use mcstatus directly and invoke any of its other commands:
-
-```
-> docker exec mc mcstatus localhost status
-version: v1.12 (protocol 335)
-description: "{u'text': u'A Minecraft Server Powered by Docker'}"
-players: 0/20 No players online
-```
-
 ## Running a Forge Server

 Enable Forge server mode by adding a `-e TYPE=FORGE` to your command-line.
@@ -145,20 +109,6 @@ but you can also choose to run a specific version with `-e FORGEVERSION=10.13.4.
        -e TYPE=FORGE -e FORGEVERSION=10.13.4.1448 \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

-To use a pre-downloaded Forge installer, place it in the attached `/data` directory and
-specify the name of the installer file with `FORGE_INSTALLER`, such as:
-
-    $ docker run -d -v /path/on/host:/data ... \
-        -e FORGE_INSTALLER=forge-1.11.2-13.20.0.2228-installer.jar ...
-
-To download a Forge installer from a custom location, such as your own file repository, specify
-the URL with `FORGE_INSTALLER_URL`, such as:
-
-    $ docker run -d -v /path/on/host:/data ... \
-        -e FORGE_INSTALLER_URL=http://HOST/forge-1.11.2-13.20.0.2228-installer.jar ...
-
-In both of the cases above, there is no need for the `VERSION` or `FORGEVERSION` variables.
-
 In order to add mods, you have two options.

 ### Using the /data volume
@@ -209,10 +159,6 @@ Enable Bukkit/Spigot server mode by adding a `-e TYPE=BUKKIT -e VERSION=1.8` or
        -e TYPE=SPIGOT -e VERSION=1.8 \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server

-If you are hosting your own copy of Bukkit/Spigot you can override the download URLs with:
-* -e BUKKIT_DOWNLOAD_URL=<url>
-* -e SPIGOT_DOWNLOAD_URL=<url>
-
 You can build spigot from source by adding `-e BUILD_FROM_SOURCE=true`

 __NOTE: to avoid pegging the CPU when running Spigot,__ you will need to
@@ -278,9 +224,6 @@ pass `--noconsole` at the very end of the command line and not use `-it`. For ex
        -e TYPE=PAPER -e VERSION=1.9.4 \
        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server --noconsole

-If you are hosting your own copy of PaperSpigot you can override the download URL with:
-* -e PAPER_DOWNLOAD_URL=<url>
-
 You can install Bukkit plugins in two ways...

 ### Using the /data volume
@@ -321,78 +264,6 @@ 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
-
-Instead of explicitly downloading a modpack from the Feed the Beast site, you
-can you set `FTB_SERVER_MOD` to the **server** URL of a modpack, such as
-
-    $ docker run ... \
-      -e TYPE=FTB \
-      -e FTB_SERVER_MOD=https://www.feed-the-beast.com/projects/ftb-infinity-lite-1-10/files/2402889
-
-### 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
-
-### Fixing "unable to launch forgemodloader"
-
-If your server's modpack fails to load with an error [like this](https://support.feed-the-beast.com/t/cant-start-crashlanding-server-unable-to-launch-forgemodloader/6028/2):
-
-    unable to launch forgemodloader
-
-then you apply a workaround by adding this to the run invocation:
-
-    -e FTB_LEGACYJAVAFIXER=true
-
-## Running a SpongeVanilla server
-
-Enable SpongeVanilla server mode by adding a `-e TYPE=SPONGEVANILLA` to your command-line.
-By default the container will run the latest `STABLE` version.
-If you want to run a specific version, you can add `-e SPONGEVERSION=1.11.2-6.1.0-BETA-19` to your command-line.
-
-    docker run -d -v /path/on/host:/data -e TYPE=SPONGEVANILLA \
-        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
-
-You can also choose to use the `EXPERIMENTAL` branch.
-Just change it with `SPONGEBRANCH`, such as:
-
-    $ docker run -d -v /path/on/host:/data ... \
-        -e TYPE=SPONGEVANILLA -e SPONGEBRANCH=EXPERIMENTAL ...
-
 ## Using Docker Compose

 Rather than type the server options below, the port mappings above, etc
@@ -419,18 +290,13 @@ minecraft-server:

 and in the same directory as that file run

-    docker-compose up -d
+    docker-compose -d up

 Now, go play...or adjust the  `environment` section to configure
 this server instance.    

 ## Server configuration

-### Server port
-
-The server port can be set like:
-    docker run -d -e SERVER_PORT=25565 ...
-
 ### Difficulty

 The difficulty level (default: `easy`) can be set like:
@@ -511,20 +377,18 @@ Enables command blocks
 ### Force Gamemode

 Force players to join in the default game mode.
+- false - Players will join in the gamemode they left in.
+- true - Players will always join in the default gamemode.

-* false - Players will join in the gamemode they left in.
-* true - Players will always join in the default gamemode.
-
-    `docker run -d -e FORCE_GAMEMODE=false`
+    docker run -d -e FORCE_GAMEMODE=false

 ### Generate Structures

 Defines whether structures (such as villages) will be generated.
+- false - Structures will not be generated in new chunks.
+- true - Structures will be generated in new chunks.

-* false - Structures will not be generated in new chunks.
-* true - Structures will be generated in new chunks.
-
-    `docker run -d -e GENERATE_STRUCTURES=true`
+    docker run -d -e GENERATE_STRUCTURES=true

 ### Hardcore

@@ -532,12 +396,6 @@ If set to true, players will be set to spectator mode if they die.

    docker run -d -e HARDCORE=false

-### Snooper
-
-If set to false, the server will not send data to snoop.minecraft.net server.
-
-    docker run -d -e SNOOPER_ENABLED=false
-
 ### Max Build Height

 The maximum height in which building is allowed.
@@ -604,14 +462,8 @@ The message of the day, shown below each server entry in the UI, can be changed

    docker run -d -e 'MOTD=My Server' ...

-If you leave it off, a default is computed from the server type and version, such as
-
-    A Paper Minecraft Server powered by Docker
-
-when `TYPE` is `PAPER`. That way you can easily differentiate between several servers you may have started.
-
-_The example shows how to specify a server message of the day that contains spaces by putting quotes
-around the whole thing._
+If you leave it off, the last used or default message will be used. _The example shows how to specify a server
+message of the day that contains spaces by putting quotes around the whole thing._

 ### PVP Mode

@@ -630,11 +482,10 @@ be configured by setting `LEVEL_TYPE` to
 * LARGEBIOMES
 * AMPLIFIED
 * CUSTOMIZED
-* BUFFET

 Descriptions are available at the [gamepedia](http://minecraft.gamepedia.com/Server.properties).

-When using a level type of `FLAT`, `CUSTOMIZED`, and `BUFFET`, you can further configure the world generator
+When using a level type of `FLAT` and `CUSTOMIZED`, you can further configure the world generator
 by passing [custom generator settings](http://minecraft.gamepedia.com/Superflat).
 **Since generator settings usually have ;'s in them, surround the -e value with a single quote, like below.**

@@ -674,19 +525,6 @@ will be deleted when the container is deleted.
 you should use an IP address or a globally resolveable FQDN, or else the
 name of a linked container.

-### Cloning world from a container path
-
-The `WORLD` option can also be used to reference a directory that will be used
-as a source to clone the world directory.
-
-For example, the following would initially clone the world's content
-from `/worlds/basic`. Also notice in the example that you can use a
-read-only volume attachment to ensure the clone source remains pristine.
-
-```
-docker run ... -v $HOME/worlds:/worlds:ro -e WORLD=/worlds/basic 
-```
-
 ### Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers

 Like the `WORLD` option above, you can specify the URL of a "mod pack"
@@ -699,68 +537,21 @@ 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

    docker run -d -e ONLINE_MODE=FALSE ...

-### Allow flight
-
-Allows users to use flight on your server while in Survival mode, if they have a mod that provides flight installed.
-
-    -e ALLOW_FLIGHT=TRUE|FALSE
-
 ## Miscellaneous Options

-### Running as alternate user/group ID
-
-By default, the container will switch to user ID 1000 and group ID 1000;
-however, you can override those values by setting `UID` and/or `GID` as environmental entries, during the `docker run` command.
-
-    -e UID=1234
-    -e GID=1234
-
-The container will also skip user switching if the `--user`/`-u` argument
-is passed to `docker run`.
-
 ### Memory Limit

-By default, the image declares a Java initial and maximum memory limit of 1 GB. There are several
-ways to adjust the memory settings:
+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):

-* `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
+    docker run -e 'JVM_OPTS=-Xmx1024M -Xms1024M' ...

-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

-### JVM Options
-
-General JVM options can be passed to the Minecraft Server invocation by passing a `JVM_OPTS`
-environment variable. Options like `-X` that need to proceed general JVM options can be passed
-via a `JVM_XX_OPTS` environment variable.
-
-### HTTP Proxy
-
-You may configure the use of an HTTP/HTTPS proxy by passing the proxy's URL via the `PROXY`
-environment variable. In [the example compose file](docker-compose-proxied.yml) it references
-a companion squid proxy by setting the equivalent of
-
-    -e PROXY=proxy:3128
+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`.
--- a/minecraft-server/docker-compose-big.yml
+++ b/minecraft-server/docker-compose-big.yml
@@ -1,29 +0,0 @@
-version: '3'
-
-services:
-  minecraft:
-    ports:
-      - "25565: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
-  rcon:
-    image: itzg/rcon
-    ports:
-      - "4326:4326"
-      - "4327:4327"
-    volumes:
-      - "rcon:/opt/rcon-web-admin/db"
-
-volumes:
-  mcbig:
-  rcon:
--- a/minecraft-server/docker-compose-proxied.yml
+++ b/minecraft-server/docker-compose-proxied.yml
@@ -1,16 +0,0 @@
-version: '3'
-
-services:
-  mc:
-#    build: .
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    environment:
-      EULA: "TRUE"
-#      TYPE: SPIGOT
-#      VERSION: 1.11.2
-      PROXY: proxy:3128
-  proxy:
-    image: sameersbn/squid
-
--- a/minecraft-server/docker-compose.yml
+++ b/minecraft-server/docker-compose.yml
@@ -1,27 +1,14 @@
-version: '3'
+minecraft-server:
+  ports:
+    - "25565:25565"

-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"
+  environment:
+    EULA: "TRUE"

-volumes:
-  mc:
-  rcon:
+  image: itzg/minecraft-server
+
+  container_name: minecraft-server
+
+  tty: true
+  stdin_open: true
+  restart: always
--- a/minecraft-server/examples/docker-compose-curseforge.yml
+++ b/minecraft-server/examples/docker-compose-curseforge.yml
@@ -1,11 +0,0 @@
-version: '3.2'
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      TYPE: FTB
-      FTB_SERVER_MOD: https://minecraft.curseforge.com/projects/all-the-mods-expert-remastered/files/2493900/download
-    ports:
-      - 25565:25565
--- a/minecraft-server/examples/docker-compose-ftb.yml
+++ b/minecraft-server/examples/docker-compose-ftb.yml
@@ -1,16 +0,0 @@
-version: '3.2'
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      TYPE: FTB
-      FTB_SERVER_MOD: https://www.feed-the-beast.com/projects/ftb-presents-skyfactory-3/files/2481284
-    ports:
-      - 25565:25565
-    volumes:
-      - mc-ftb:/data
-
-volumes:
-  mc-ftb:
--- a/minecraft-server/k8s-examples/vanilla-deployment.yml
+++ b/minecraft-server/k8s-examples/vanilla-deployment.yml
@@ -1,41 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: mc-vanilla
-spec:
-  type: NodePort
-  ports:
-  - port: 25565
-    nodePort: 30000
-  selector:
-    app: mc-vanilla
---
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mc-vanilla
-spec:
-  selector:
-    matchLabels:
-      app: mc-vanilla
-  template:
-    metadata:
-      labels:
-        app: mc-vanilla
-    spec:
-      containers:
-      - image: itzg/minecraft-server
-        name: mc-vanilla
-        env:
-          # Use secret in real usage
-        - name: EULA
-          value: "true"
-        ports:
-        - containerPort: 25565
-          name: main
-        volumeMounts:
-        - name: mc-data
-          mountPath: /data
-      volumes:
-      - name: mc-data
-        emptyDir: {}
--- a/minecraft-server/mcadmin.jq
+++ b/minecraft-server/mcadmin.jq
@@ -1,7 +1,7 @@
 .[] |
 select(.elements | length > 1) |
  select(.elements[].elements[] | select(.class == "version" and .text == $version)) |
-   .elements[].elements[] |
+   .elements[].elements[] | 
    select(.class|contains("server-jar")) |
     .elements[] | select(.name="a") |
      .href
--- a/minecraft-server/start
+++ b/minecraft-server/start
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-umask 0002
-chmod g+w /data
-
-if [ $(id -u) = 0 ]; then
-  if [[ -v UID && $UID != $(id -u) ]]; then
-    usermod -u $UID minecraft
-  fi
-  if [[ -v GID ]]; then
-    groupmod -g $GID minecraft
-  fi
-
-  if [[ $(stat -c "%u" /data) != $UID ]]; then
-    echo "Changing ownership of /data to $UID ..."
-    chown -R minecraft:minecraft /data
-  fi
-
-  exec su-exec minecraft:minecraft /start-configuration
-else
-  exec /start-configuration
-fi
--- a/minecraft-server/start-configuration
+++ b/minecraft-server/start-configuration
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-shopt -s nullglob
-
-#umask 002
-export HOME=/data
-
-if [ ! -e /data/eula.txt ]; then
-  if [ "$EULA" != "" ]; then
-    echo "# Generated via Docker on $(date)" > eula.txt
-    echo "eula=$EULA" >> eula.txt
-    if [ $? != 0 ]; then
-      echo "ERROR: unable to write eula to /data. Please make sure attached directory is writable by uid=${UID}"
-      exit 2
-    fi
-  else
-    echo ""
-    echo "Please accept the Minecraft EULA at"
-    echo "  https://account.mojang.com/documents/minecraft_eula"
-    echo "by adding the following immediately after 'docker run':"
-    echo "  -e EULA=TRUE"
-    echo ""
-    exit 1
-  fi
-fi
-
-echo "Running as uid=$(id -u) gid=$(id -g) with /data as '$(ls -lnd /data)'"
-
-if ! touch /data/.verify_access; then
-  echo "ERROR: /data doesn't seem to be writable. Please make sure attached directory is writable by uid=$(id -u)"
-  exit 2
-fi
-
-rm /data/.verify_access || true
-
-if [[ $PROXY ]]; then
-    export http_proxy="$PROXY"
-    export https_proxy="$PROXY"
-    echo "INFO: Giving proxy time to startup..."
-    sleep 5
-fi
-
-export SERVER_PROPERTIES=/data/server.properties
-export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json
-
-echo "Checking version information."
-case "X$VERSION" in
-  X|XLATEST|Xlatest)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.release'`
-  ;;
-  XSNAPSHOT|Xsnapshot)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.snapshot'`
-  ;;
-  X[1-9]*)
-    export VANILLA_VERSION=$VERSION
-  ;;
-  *)
-    export VANILLA_VERSION=`curl -fsSL $VERSIONS_JSON | jq -r '.latest.release'`
-  ;;
-esac
-
-cd /data
-
-export ORIGINAL_TYPE=${TYPE^^}
-
-echo "Checking type information."
-case "${TYPE^^}" in
-  *BUKKIT|SPIGOT)
-    exec /start-deployBukkitSpigot $@
-  ;;
-
-  PAPER)
-    exec /start-deployPaper $@
-  ;;
-
-  FORGE)
-    exec /start-deployForge $@
-  ;;
-
-  FTB|CURSEFORGE)
-    exec /start-deployFTB $@
-  ;;
-
-  VANILLA)
-    exec /start-deployVanilla $@
-  ;;
-
-  SPONGEVANILLA)
-    exec /start-deploySpongeVanilla $@
-  ;;
-
-  *)
-      echo "Invalid type: '$TYPE'"
-      echo "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
-      exit 1
-  ;;
-
-esac
--- a/minecraft-server/start-deployBukkitSpigot
+++ b/minecraft-server/start-deployBukkitSpigot
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-function buildSpigotFromSource {
-  echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
-  mkdir /data/temp
-  cd /data/temp
-  curl -sSL -o /data/temp/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && \
-    java -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; echo "done"
-  mv spigot-*.jar /data/spigot_server.jar
-  mv craftbukkit-*.jar /data/craftbukkit_server.jar
-  echo "Cleaning up"
-  rm -rf /data/temp
-  cd /data
-}
-
-function downloadSpigot {
-  local match
-  case "$TYPE" in
-    *BUKKIT|*bukkit)
-      match="CraftBukkit"
-      downloadUrl=${BUKKIT_DOWNLOAD_URL}
-      getbukkitFlavor=craftbukkit
-      ;;
-    *)
-      match="Spigot"
-      downloadUrl=${SPIGOT_DOWNLOAD_URL}
-      getbukkitFlavor=spigot
-      ;;
-  esac
-
-  local downloadVersion
-  if [[ ${VERSION} == LATEST ]]; then
-    downloadVersion=${VANILLA_VERSION}
-  else
-    downloadVersion=${VERSION}
-  fi
-
-  if [[ -z $downloadUrl ]]; then
-    downloadUrl="https://cdn.getbukkit.org/${getbukkitFlavor}/${getbukkitFlavor}-${downloadVersion}.jar"
-  fi
-
-  echo "Downloading $match from $downloadUrl ..."
-  curl -fsSL -o $SERVER "$downloadUrl"
-  if [[ $? != 0 || $(grep -c "DOCTYPE html" $SERVER) != 0 ]]; then
-    cat <<EOF
-
-ERROR: failed to download from $downloadUrl
-       Visit https://getbukkit.org/download/${getbukkitFlavor} to lookup the
-       exact version, such as 1.4.6-R0.4-SNAPSHOT or 1.8-R0.1-SNAPSHOT-LATEST
-
-EOF
-    exit 3
-  fi
-}
-
-
-case "$TYPE" in
-  *BUKKIT|*bukkit)
-    export SERVER=craftbukkit_server.jar
-    ;;
-  *)
-    export SERVER=spigot_server.jar
-    ;;
-esac
-
-if [ ! -f $SERVER ]; then
-   if [[ "$BUILD_SPIGOT_FROM_SOURCE" = TRUE || "$BUILD_SPIGOT_FROM_SOURCE" = true || "$BUILD_FROM_SOURCE" = TRUE || "$BUILD_FROM_SOURCE" = true ]]; then
-     buildSpigotFromSource
-   else
-     downloadSpigot
-   fi
-fi
-
-# Normalize on Spigot for operations below
-export TYPE=SPIGOT
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@
--- a/minecraft-server/start-deployFTB
+++ b/minecraft-server/start-deployFTB
@@ -1,104 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-export FTB_BASE_DIR=/data/FeedTheBeast
-legacyJavaFixerUrl=http://ftb.cursecdn.com/FTB2/maven/net/minecraftforge/lex/legacyjavafixer/1.0/legacyjavafixer-1.0.jar
-export 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
-
-if [[ -d ${FTB_BASE_DIR} ]]; then
-  startScriptCount=$(find ${FTB_BASE_DIR} -name ServerStart.sh |wc -l)
-  if [[ $startScriptCount > 1 ]]; then
-    echo "Conflicting FTB/CurseForge packages have been installed. Please cleanup ${FTB_BASE_DIR}"
-    exit 2
-  fi
-else
-  startScriptCount=0
-fi
-
-# only download and install if a mod pack isn't already installed
-# also check for the start script rather than just the folder
-# this allows saving just the world separate from the rest of the data directory
-if [[ $startScriptCount = 0 ]]; then
-  srv_modpack=${FTB_SERVER_MOD}
-  if isURL ${srv_modpack}; then
-      case $srv_modpack in
-        https://www.feed-the-beast.com/*/download|https://minecraft.curseforge.com/*/download)
-          ;;
-        https://www.feed-the-beast.com/*|https://minecraft.curseforge.com/*)
-          srv_modpack=${srv_modpack}/download;;
-      esac
-      file=$(basename $(dirname $srv_modpack))
-      downloaded=/data/${file}.zip
-      if [ ! -e $downloaded ]; then
-        echo "Downloading FTB modpack...
-  $srv_modpack -> $downloaded"
-        curl -sSL -o $downloaded $srv_modpack
-      fi
-      srv_modpack=$downloaded
-  fi
-  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} ..."
-  mkdir -p ${FTB_BASE_DIR}
-  unzip -o ${srv_modpack} -d ${FTB_BASE_DIR} | awk '{printf "."} END {print ""}'
-fi
-
-if [[ $(find ${FTB_BASE_DIR} -name ServerStart.sh -o -name LaunchServer.sh |wc -l) = 0 ]]; then
-    echo "Please make sure you are using the server version of the FTB modpack!"
-    exit 2
-fi
-
-export FTB_SERVER_START=$(find ${FTB_BASE_DIR} -name ServerStart.sh -o -name LaunchServer.sh)
-if [[ $(echo ${FTB_SERVER_START} | wc -w) != 1 ]]; then
-    echo "Please make sure you are using the server version of the FTB modpack!"
-    exit 2
-fi
-
-export FTB_DIR=$(dirname ${FTB_SERVER_START})
-chmod a+x ${FTB_SERVER_START}
-sed -i 's/-jar/-Dfml.queryResult=confirm -jar/' ${FTB_SERVER_START}
-sed -i 's/.*read.*Restart now/#\0/' ${FTB_SERVER_START}
-legacyJavaFixerPath=${FTB_DIR}/mods/legacyjavafixer.jar
-
-if isTrue ${FTB_LEGACYJAVAFIXER} && [ ! -e ${legacyJavaFixerPath} ]; then
-  echo "Installing legacy java fixer to ${legacyJavaFixerPath}"
-  curl -sSL -o ${legacyJavaFixerPath} ${legacyJavaFixerUrl}
-fi
-
-if [ -e ${FTB_DIR}/FTBInstall.sh ]; then
-  pushd ${FTB_DIR}
-  sh FTBInstall.sh
-  popd
-elif [ -e ${FTB_DIR}/Install.sh ]; then
-  pushd ${FTB_DIR}
-  sh Install.sh
-  popd
-fi
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@
--- a/minecraft-server/start-deployForge
+++ b/minecraft-server/start-deployForge
@@ -1,120 +0,0 @@
-#!/bin/bash
-
-export TYPE=FORGE
-
-if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then
-  norm=$VANILLA_VERSION
-
-  case $VANILLA_VERSION in
-    *.*.*)
-      norm=$VANILLA_VERSION ;;
-    *.*)
-      norm=${VANILLA_VERSION}.0 ;;
-  esac
-
-  ################### TEMPORORAY LOGIC util forge is generally available for 1.13
-
-  if [[ $VERSION = LATEST ]]; then
-    VANILLA_VERSION=1.12.2
-  fi
-
-  #################################################################################
-
-  echo "Checking Forge version information."
-  case $FORGEVERSION in
-    RECOMMENDED)
-      curl -fsSL -o /tmp/forge.json http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json
-      FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-recommended\"]")
-      if [ $FORGE_VERSION = null ]; then
-        FORGE_VERSION=$(cat /tmp/forge.json | jq -r ".promos[\"$VANILLA_VERSION-latest\"]")
-        if [ $FORGE_VERSION = null ]; then
-          echo "ERROR: Version $VANILLA_VERSION is not supported by Forge"
-          echo "       Refer to http://files.minecraftforge.net/ for supported versions"
-          exit 2
-        fi
-      fi
-      ;;
-
-    *)
-      FORGE_VERSION=$FORGEVERSION
-      ;;
-  esac
-
-  normForgeVersion=$VANILLA_VERSION-$FORGE_VERSION-$norm
-  shortForgeVersion=$VANILLA_VERSION-$FORGE_VERSION
-
-  FORGE_INSTALLER="/tmp/forge-$shortForgeVersion-installer.jar"
-elif [[ -z $FORGE_INSTALLER ]]; then
-  FORGE_INSTALLER="/tmp/forge-installer.jar"
-elif [[ ! -e $FORGE_INSTALLER ]]; then
-  echo "ERROR: the given Forge installer doesn't exist : $FORGE_INSTALLER"
-  exit 2
-fi
-
-installMarker=".forge-installed-$shortForgeVersion"
-
-if [ ! -e $installMarker ]; then
-  if [ ! -e $FORGE_INSTALLER ]; then
-
-    if [[ -z $FORGE_INSTALLER_URL ]]; then
-      echo "Downloading $normForgeVersion"
-
-      forgeFileNames="
-      $normForgeVersion/forge-$normForgeVersion-installer.jar
-      $shortForgeVersion/forge-$shortForgeVersion-installer.jar
-      END
-    "
-      for fn in $forgeFileNames; do
-        if [ $fn == END ]; then
-          echo "Unable to compute URL for $normForgeVersion"
-          exit 2
-        fi
-        downloadUrl=http://files.minecraftforge.net/maven/net/minecraftforge/forge/$fn
-        echo "...trying $downloadUrl"
-        if curl -o $FORGE_INSTALLER -fsSL $downloadUrl; then
-          break
-        fi
-      done
-    else
-      echo "Downloading $FORGE_INSTALLER_URL ..."
-      if ! curl -o $FORGE_INSTALLER -fsSL $FORGE_INSTALLER_URL; then
-        echo "Failed to download from given location $FORGE_INSTALLER_URL"
-        exit 2
-      fi
-    fi
-  fi
-
-  echo "Installing Forge $shortForgeVersion using $FORGE_INSTALLER"
-  mkdir -p mods
-  tries=3
-  while ((--tries >= 0)); do
-    java -jar $FORGE_INSTALLER --installServer
-    if [ $? == 0 ]; then
-      break
-    fi
-  done
-  if (($tries < 0)); then
-    echo "Forge failed to install after several tries." >&2
-    exit 10
-  fi
-  # NOTE $shortForgeVersion will be empty if installer location was given to us
-  echo "Finding installed server jar..."
-  unset -v latest
-  for file in *forge*.jar; do
-    [[ $file =~ installer ]] || [[ $file -nt $latest ]] && latest=$file
-  done
-  if [[ -z $latest ]]; then
-    echo "Unable to derive server jar for Forge"
-    exit 2
-  fi
-
-  export SERVER=$latest
-  echo "Using server $SERVER"
-  echo $SERVER > $installMarker
-
-else
-  export SERVER=$(cat $installMarker)
-fi
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@
--- a/minecraft-server/start-deployPaper
+++ b/minecraft-server/start-deployPaper
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-export SERVER=paper_server.jar
-if [ ! -f $SERVER ]; then
-  job=PaperSpigot
-  case "${VANILLA_VERSION}" in
-    1.13.*)
-      job=Paper-1.13
-      build="lastSuccessfulBuild"
-      ;;
-    1.12.2)
-      build="lastSuccessfulBuild";;
-    1.11.2)
-      build="1104";;
-    1.10.2)
-      build="916";;
-    1.9.4)
-      build="773";;
-    1.9.2)
-      build="727";;
-    1.9)
-      build="612";;
-    1.8.8)
-      build="443";;
-    *)
-      build="nosupp";;
-  esac
-
-  if [ $build != "nosupp" ]; then
-    rm -f $SERVER
-    downloadUrl=${PAPER_DOWNLOAD_URL:-https://ci.destroystokyo.com/job/$job/$build/artifact/paperclip.jar}
-    echo "Downloading Paper $VANILLA_VERSION from $downloadUrl ..."
-    curl -fsSL -o $SERVER "$downloadUrl"
-    if [ ! -f $SERVER ]; then
-      echo "ERROR: failed to download from $downloadUrl (status=$?)"
-      exit 3
-    fi
-  else
-    echo "ERROR: Version $VERSION is not supported for $TYPE"
-    echo "       Refer to https://ci.destroystokyo.com/job/PaperSpigot/"
-    echo "       for supported versions"
-    exit 2
-  fi
-fi
-
-# Normalize on Spigot for operations below
-export TYPE=SPIGOT
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@
--- a/minecraft-server/start-deploySpongeVanilla
+++ b/minecraft-server/start-deploySpongeVanilla
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-export TYPE=spongevanilla
-
-# Parse branch
-echo "Choosing branch for Sponge"
-case "$SPONGEBRANCH" in
-
-  EXPERIMENTAL|experimental|BLEEDING|bleeding)
-    SPONGEBRANCH=bleeding
-  ;;
-
-  *)
-    SPONGEBRANCH=stable
-  ;;
-
-esac
-
-# If not SPONGEVERSION selected, detect last version on selected branch
-if [ -z $SPONGEVERSION ]; then
-  echo "Choosing Version for Sponge"
-  if [ "$SPONGEBRANCH" == "stable" ]; then
-    export SPONGEVERSION=`curl -fsSL https://dl-api.spongepowered.org/v1/org.spongepowered/$TYPE | jq -r '.buildTypes.stable.latest.version'`
-  else
-    export SPONGEVERSION=`curl -fsSL https://dl-api.spongepowered.org/v1/org.spongepowered/$TYPE | jq -r '.buildTypes.bleeding.latest.version'`
-  fi
-fi
-
-export SERVER="spongevanilla-$SPONGEVERSION.jar"
-
-if [ ! -e $SERVER ]; then
-  echo "Downloading $SERVER ..."
-  curl -sSL -o $SERVER https://repo.spongepowered.org/maven/org/spongepowered/$TYPE/$SPONGEVERSION/$SERVER
-fi
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@
--- a/minecraft-server/start-deployVanilla
+++ b/minecraft-server/start-deployVanilla
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-export SERVER="minecraft_server.$VANILLA_VERSION.jar"
-
-if [ ! -e $SERVER ]; then
-  echo "Downloading $SERVER ..."
-  curl -sSL -o $SERVER $(curl -s $(curl -s 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url') | jq --raw-output '.downloads.server.url')
-fi
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@
--- a/minecraft-server/start-finalSetup01World
+++ b/minecraft-server/start-finalSetup01World
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-worldDest=/data/$LEVEL
-
-# If supplied with a URL for a world, download it and unpack
-if [[ "$WORLD" ]]; then
-case "X$WORLD" in
-  X[Hh][Tt][Tt][Pp]*)
-    echo "Downloading world from $WORLD"
-    curl -sSL -o - "$WORLD" > /data/world.zip
-    echo "Unzipping world"
-    unzip -o -q /data/world.zip
-    rm -f /data/world.zip
-    if [ ! -d $worldDest ]; then
-      echo World directory not found
-      for i in /data/*/level.dat; do
-        if [ -f "$i" ]; then
-          d=`dirname "$i"`
-          echo Renaming world directory from $d
-          mv -f "$d" $worldDest
-        fi
-      done
-    fi
-    if [ "$TYPE" = "SPIGOT" ]; then
-      # Reorganise if a Spigot server
-      echo "Moving End and Nether maps to Spigot location"
-      [ -d "$worldDest/DIM1" ] && mv -f "$worldDest/DIM1" "/data/${LEVEL}_the_end"
-      [ -d "$worldDest/DIM-1" ] && mv -f "$worldDest/DIM-1" "/data/${LEVEL}_nether"
-    fi
-    ;;
-  *)
-    if [[ -d $WORLD ]]; then
-      if [[ ! -d $worldDest ]]; then
-        echo "Cloning world directory from $WORLD ..."
-        cp -r $WORLD $worldDest
-      else
-        echo "Skipping clone from $WORLD since $worldDest exists"
-      fi
-    else
-      echo "Invalid URL given for world: Must be HTTP or HTTPS and a ZIP file"
-    fi
-    ;;
-esac
-fi
-
-exec /start-finalSetup02Modpack $@
--- a/minecraft-server/start-finalSetup02Modpack
+++ b/minecraft-server/start-finalSetup02Modpack
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# If supplied with a URL for a modpack (simple zip of jars), download it and unpack
-if [[ "$MODPACK" ]]; then
-case "X$MODPACK" in
-  X[Hh][Tt][Tt][Pp]*.zip)
-    echo "Downloading mod/plugin pack via HTTP"
-    echo "  from $MODPACK ..."
-    if ! curl -sSL -o /tmp/modpack.zip "$MODPACK"; then
-      echo "ERROR: failed to download from $MODPACK"
-      exit 2
-    fi
-
-    if [ "$TYPE" = "SPIGOT" ]; then
-      if [ "$REMOVE_OLD_MODS" = "TRUE" ]; then
-        rm -rf /data/plugins/*
-      fi
-      mkdir -p /data/plugins
-      if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
-        echo "ERROR: failed to unzip the modpack from $MODPACK"
-      fi
-    else
-      if [ "$REMOVE_OLD_MODS" = "TRUE" ]; then
-        rm -rf /data/mods/*
-      fi
-      mkdir -p /data/mods
-      if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-        echo "ERROR: failed to unzip the modpack from $MODPACK"
-      fi
-    fi
-    rm -f /tmp/modpack.zip
-    ;;
-  *)
-    echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
-    ;;
-esac
-fi
-
-exec /start-finalSetup03Modconfig $@
--- a/minecraft-server/start-finalSetup03Modconfig
+++ b/minecraft-server/start-finalSetup03Modconfig
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# If supplied with a URL for a config (simple zip of configurations), download it and unpack
-if [[ "$MODCONFIG" ]]; then
-case "X$MODCONFIG" in
-  X[Hh][Tt][Tt][Pp]*[Zz][iI][pP])
-    echo "Downloading mod/plugin configs via HTTP"
-    echo "  from $MODCONFIG ..."
-    curl -sSL -o /tmp/modconfig.zip "$MODCONFIG"
-    if [ "$TYPE" = "SPIGOT" ]; then
-      mkdir -p /data/plugins
-      unzip -o -d /data/plugins /tmp/modconfig.zip
-    else
-      mkdir -p /data/config
-      unzip -o -d /data/config /tmp/modconfig.zip
-    fi
-    rm -f /tmp/modconfig.zip
-    ;;
-  *)
-    echo "Invalid URL given for modconfig: Must be HTTP or HTTPS and a ZIP file"
-    ;;
-esac
-fi
-
-exec /start-finalSetup04ServerProperties $@
--- a/minecraft-server/start-finalSetup04ServerProperties
+++ b/minecraft-server/start-finalSetup04ServerProperties
@@ -1,149 +0,0 @@
-#!/bin/bash
-
-# FUNCTIONS
-function setServerProp {
-  local prop=$1
-  local var=$2
-  if [ -n "$var" ]; then
-    # normalize booleans
-    case ${var^^} in
-      TRUE|FALSE)
-        var=${var,,} ;;
-    esac
-    echo "Setting ${prop} to '${var}' in ${SERVER_PROPERTIES}"
-    sed -i "/^${prop}\s*=/ c ${prop}=${var}" $SERVER_PROPERTIES
-  else
-    echo "Skip setting ${prop}"
-  fi
-}
-
-# Deploy server.properties file
-if [ ! -e $SERVER_PROPERTIES ]; then
-  echo "Creating server.properties in ${SERVER_PROPERTIES}"
-  cp /tmp/server.properties $SERVER_PROPERTIES
-
-  if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
-    export SERVER_PROPERTIES=${FTB_DIR}/server.properties
-    echo "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
-    cp /tmp/server.properties $SERVER_PROPERTIES
-  fi
-
-  if [ -n "$WHITELIST" ]; then
-    echo "Creating whitelist"
-    setServerProp "whitelist" "true"
-    setServerProp "white-list" "true"
-  fi
-
-  # If not provided, generate a reasonable default message-of-the-day,
-  # which shows up in the server listing in the client
-  if [ -z $MOTD ]; then
-    # snapshot is the odd case where we have to look at version to identify that label
-    if [[ ${ORIGINAL_TYPE} == "VANILLA" && ${VERSION} == "SNAPSHOT" ]]; then
-      label=SNAPSHOT
-    else
-      label=${ORIGINAL_TYPE}
-    fi
-
-    # Convert label to title-case
-    label=${label,,}
-    label=${label^}
-    MOTD="A ${label} Minecraft Server powered by Docker"
-  fi
-
-  setServerProp "server-port" "$SERVER_PORT"
-  setServerProp "motd" "$MOTD"
-  setServerProp "allow-nether" "$ALLOW_NETHER"
-  setServerProp "announce-player-achievements" "$ANNOUNCE_PLAYER_ACHIEVEMENTS"
-  setServerProp "enable-command-block" "$ENABLE_COMMAND_BLOCK"
-  setServerProp "spawn-animals" "$SPAWN_ANIMALS"
-  setServerProp "spawn-monsters" "$SPAWN_MONSTERS"
-  setServerProp "spawn-npcs" "$SPAWN_NPCS"
-  setServerProp "generate-structures" "$GENERATE_STRUCTURES"
-  setServerProp "view-distance" "$VIEW_DISTANCE"
-  setServerProp "hardcore" "$HARDCORE"
-  setServerProp "snooper-enabled" "$SNOOPER_ENABLED"
-  setServerProp "max-build-height" "$MAX_BUILD_HEIGHT"
-  setServerProp "force-gamemode" "$FORCE_GAMEMODE"
-  setServerProp "max-tick-time" "$MAX_TICK_TIME"
-  setServerProp "enable-query" "$ENABLE_QUERY"
-  setServerProp "query.port" "$QUERY_PORT"
-  setServerProp "enable-rcon" "$ENABLE_RCON"
-  setServerProp "rcon.password" "$RCON_PASSWORD"
-  setServerProp "rcon.port" "$RCON_PORT"
-  setServerProp "max-players" "$MAX_PLAYERS"
-  setServerProp "max-world-size" "$MAX_WORLD_SIZE"
-  setServerProp "level-name" "$LEVEL"
-  setServerProp "level-seed" "$SEED"
-  setServerProp "pvp" "$PVP"
-  setServerProp "generator-settings" "$GENERATOR_SETTINGS"
-  setServerProp "online-mode" "$ONLINE_MODE"
-  setServerProp "allow-flight" "$ALLOW_FLIGHT"
-
-  if [ -n "$LEVEL_TYPE" ]; then
-    # normalize to uppercase
-    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
-      DEFAULT|FLAT|LARGEBIOMES|AMPLIFIED|CUSTOMIZED|BIOMESOP|RTG|RWG|BUFFET)
-        setServerProp "level-type" "$LEVEL_TYPE"
-        ;;
-      *)
-        echo "Invalid LEVEL_TYPE: $LEVEL_TYPE"
-        exit 1
-        ;;
-    esac
-  fi
-
-  if [ -n "$DIFFICULTY" ]; then
-    case $DIFFICULTY in
-      peaceful|0)
-        DIFFICULTY=0
-        ;;
-      easy|1)
-        DIFFICULTY=1
-        ;;
-      normal|2)
-        DIFFICULTY=2
-        ;;
-      hard|3)
-        DIFFICULTY=3
-        ;;
-      *)
-        echo "DIFFICULTY must be peaceful, easy, normal, or hard."
-        exit 1
-        ;;
-    esac
-    setServerProp "difficulty" "$DIFFICULTY"
-  fi
-
-  if [ -n "$MODE" ]; then
-    echo "Setting mode"
-    MODE_LC=$( echo $MODE | tr '[:upper:]' '[:lower:]' )
-    case $MODE_LC in
-      0|1|2|3)
-        ;;
-      su*)
-        MODE=0
-        ;;
-      c*)
-        MODE=1
-        ;;
-      a*)
-        MODE=2
-        ;;
-      sp*)
-        MODE=3
-        ;;
-      *)
-        echo "ERROR: Invalid game mode: $MODE"
-        exit 1
-        ;;
-    esac
-    setServerProp "gamemode" "$MODE"
-  fi
-else
-  echo "server.properties already created, skipping"
-fi
-
-exec /start-minecraftFinalSetup $@
--- a/minecraft-server/start-minecraft.sh
+++ b/minecraft-server/start-minecraft.sh
@@ -0,0 +1,456 @@
+#!/bin/bash
+
+#umask 002
+export HOME=/data
+
+if [ ! -e /data/eula.txt ]; then
+  if [ "$EULA" != "" ]; then
+    echo "# Generated via Docker on $(date)" > eula.txt
+    echo "eula=$EULA" >> eula.txt
+  else
+    echo ""
+    echo "Please accept the Minecraft EULA at"
+    echo "  https://account.mojang.com/documents/minecraft_eula"
+    echo "by adding the following immediately after 'docker run':"
+    echo "  -e EULA=TRUE"
+    echo ""
+    exit 1
+  fi
+fi
+
+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'`
+  ;;
+  XSNAPSHOT|Xsnapshot)
+    VANILLA_VERSION=`curl -sSL $VERSIONS_JSON | jq -r '.latest.snapshot'`
+  ;;
+  X[1-9]*)
+    VANILLA_VERSION=$VERSION
+  ;;
+  *)
+    VANILLA_VERSION=`curl -sSL $VERSIONS_JSON | jq -r '.latest.release'`
+  ;;
+esac
+
+cd /data
+
+function buildSpigotFromSource {
+  echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
+  mkdir /data/temp
+  cd /data/temp
+  wget -q -P /data/temp https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && \
+    java -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; echo "done"
+  mv spigot-*.jar /data/spigot_server.jar
+  mv craftbukkit-*.jar /data/craftbukkit_server.jar
+  echo "Cleaning up"
+  rm -rf /data/temp
+  cd /data
+}
+
+function downloadSpigot {
+  local match
+  case "$TYPE" in
+    *BUKKIT|*bukkit)
+      match="Craftbukkit"
+
+      ;;
+    *)
+      match="Spigot"
+      ;;
+  esac
+
+  downloadUrl=$(restify --class=jar-div https://mcadmin.net/ | \
+    jq --arg version "$match $VANILLA_VERSION" -r -f /usr/share/mcadmin.jq)
+  if [[ -n $downloadUrl ]]; then
+    echo "Downloading $match"
+    wget -q -O $SERVER "$downloadUrl"
+    status=$?
+    if [ $status != 0 ]; then
+      echo "ERROR: failed to download from $downloadUrl due to (error code was $status)"
+      exit 3
+    fi
+  else
+    echo "ERROR: Version $VANILLA_VERSION is not supported for $TYPE"
+    echo "       Refer to https://mcadmin.net/ for supported versions"
+    exit 2
+  fi
+}
+
+function downloadPaper {
+  local build
+  case "$VERSION" in
+    latest|LATEST|1.10)
+      build="lastSuccessfulBuild";;
+    1.9.4)
+      build="773";;
+    1.9.2)
+      build="727";;
+    1.9)
+      build="612";;
+    1.8.8)
+      build="443";;
+    *)
+      build="nosupp";;
+  esac
+
+  if [ $build != "nosupp" ]; then
+    downloadUrl="https://ci.destroystokyo.com/job/PaperSpigot/$build/artifact/paperclip.jar"
+    wget -q -O $SERVER "$downloadUrl"
+    status=$?
+    if [ $status != 0 ]; then
+      echo "ERROR: failed to download from $downloadUrl due to (error code was $status)"
+      exit 3
+    fi
+  else
+    echo "ERROR: Version $VERSION is not supported for $TYPE"
+    echo "       Refer to https://ci.destroystokyo.com/job/PaperSpigot/"
+    echo "       for supported versions"
+    exit 2
+  fi
+}
+
+function installForge {
+  TYPE=FORGE
+  norm=$VANILLA_VERSION
+
+  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
+      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\"]")
+        if [ $FORGE_VERSION = null ]; then
+          echo "ERROR: Version $FORGE_VERSION is not supported by Forge"
+          echo "       Refer to http://files.minecraftforge.net/ for supported versions"
+          exit 2
+        fi
+      fi
+      ;;
+
+    *)
+      FORGE_VERSION=$FORGEVERSION
+      ;;
+  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)
+  if [[ $norm == '1.7.10' && $sorted == '10.13.2.1300' ]]; then
+      # if $FORGEVERSION >= 10.13.2.1300
+      normForgeVersion="$norm-$FORGE_VERSION-$norm"
+  else
+      normForgeVersion="$norm-$FORGE_VERSION"
+  fi
+
+  FORGE_INSTALLER="forge-$normForgeVersion-installer.jar"
+  SERVER="forge-$normForgeVersion-universal.jar"
+
+  if [ ! -e "$SERVER" ]; then
+    echo "Downloading $FORGE_INSTALLER ..."
+    wget -q http://files.minecraftforge.net/maven/net/minecraftforge/forge/$normForgeVersion/$FORGE_INSTALLER
+    echo "Installing $SERVER"
+    java -jar $FORGE_INSTALLER --installServer
+  fi
+}
+
+function installVanilla {
+  SERVER="minecraft_server.$VANILLA_VERSION.jar"
+
+  if [ ! -e $SERVER ]; then
+    echo "Downloading $SERVER ..."
+    wget -q https://s3.amazonaws.com/Minecraft.Download/versions/$VANILLA_VERSION/$SERVER
+  fi
+}
+
+echo "Checking type information."
+case "$TYPE" in
+  *BUKKIT|*bukkit|SPIGOT|spigot)
+    case "$TYPE" in
+      *BUKKIT|*bukkit)
+        SERVER=craftbukkit_server.jar
+        ;;
+      *)
+        SERVER=spigot_server.jar
+        ;;
+    esac
+
+    if [ ! -f $SERVER ]; then
+       if [[ "$BUILD_SPIGOT_FROM_SOURCE" = TRUE || "$BUILD_SPIGOT_FROM_SOURCE" = true || "$BUILD_FROM_SOURCE" = TRUE || "$BUILD_FROM_SOURCE" = true ]]; then
+         buildSpigotFromSource
+       else
+         downloadSpigot
+       fi
+    fi
+    # normalize on Spigot for operations below
+    TYPE=SPIGOT
+  ;;
+
+  PAPER|paper)
+    SERVER=paper_server.jar
+    if [ ! -f $SERVER ]; then
+      downloadPaper
+    fi
+    # normalize on Spigot for operations below
+    TYPE=SPIGOT
+  ;;
+  
+  FORGE|forge)
+    TYPE=FORGE
+    installForge
+  ;;
+
+  VANILLA|vanilla)
+    installVanilla
+  ;;
+
+  *)
+      echo "Invalid type: '$TYPE'"
+      echo "Must be: VANILLA, FORGE, SPIGOT"
+      exit 1
+  ;;
+
+esac
+
+
+# If supplied with a URL for a world, download it and unpack
+if [[ "$WORLD" ]]; then
+case "X$WORLD" in
+  X[Hh][Tt][Tt][Pp]*)
+    echo "Downloading world via HTTP"
+    echo "$WORLD"
+    wget -q -O - "$WORLD" > /data/world.zip
+    echo "Unzipping word"
+    unzip -q /data/world.zip
+    rm -f /data/world.zip
+    if [ ! -d /data/world ]; then
+      echo World directory not found
+      for i in /data/*/level.dat; do
+        if [ -f "$i" ]; then
+          d=`dirname "$i"`
+          echo Renaming world directory from $d
+          mv -f "$d" /data/world
+        fi
+      done
+    fi
+    if [ "$TYPE" = "SPIGOT" ]; then
+      # Reorganise if a Spigot server
+      echo "Moving End and Nether maps to Spigot location"
+      [ -d "/data/world/DIM1" ] && mv -f "/data/world/DIM1" "/data/world_the_end"
+      [ -d "/data/world/DIM-1" ] && mv -f "/data/world/DIM-1" "/data/world_nether"
+    fi
+    ;;
+  *)
+    echo "Invalid URL given for world: Must be HTTP or HTTPS and a ZIP file"
+    ;;
+esac
+fi
+
+# If supplied with a URL for a modpack (simple zip of jars), download it and unpack
+if [[ "$MODPACK" ]]; then
+case "X$MODPACK" in
+  X[Hh][Tt][Tt][Pp]*[Zz][iI][pP])
+    echo "Downloading mod/plugin pack via HTTP"
+    echo "$MODPACK"
+    wget -q -O /tmp/modpack.zip "$MODPACK"
+    if [ "$TYPE" = "SPIGOT" ]; then
+      mkdir -p /data/plugins
+      unzip -o -d /data/plugins /tmp/modpack.zip
+    else
+      mkdir -p /data/mods
+      unzip -o -d /data/mods /tmp/modpack.zip
+    fi
+    rm -f /tmp/modpack.zip
+    ;;
+  *)
+    echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
+    ;;
+esac
+fi
+
+function setServerProp {
+  local prop=$1
+  local var=$2
+  if [ -n "$var" ]; then
+    echo "Setting $prop to $var"
+    sed -i "/$prop\s*=/ c $prop=$var" /data/server.properties
+  fi
+
+}
+
+if [ ! -e server.properties ]; then
+  echo "Creating server.properties"
+  cp /tmp/server.properties .
+
+  if [ -n "$WHITELIST" ]; then
+    echo "Creating whitelist"
+    sed -i "/whitelist\s*=/ c whitelist=true" /data/server.properties
+    sed -i "/white-list\s*=/ c white-list=true" /data/server.properties
+  fi
+
+  setServerProp "motd" "$MOTD"
+  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-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"
+  setServerProp "force-gamemode" "$FORCE_GAMEMODE"
+  setServerProp "hardmax-tick-timecore" "$MAX_TICK_TIME"
+  setServerProp "enable-query" "$ENABLE_QUERY"
+  setServerProp "query.port" "$QUERY_PORT"
+  setServerProp "enable-rcon" "$ENABLE_RCON"
+  setServerProp "rcon.password" "$RCON_PASSWORD"
+  setServerProp "rcon.port" "$RCON_PORT"
+  setServerProp "max-players" "$MAX_PLAYERS"
+  setServerProp "max-world-size" "$MAX_WORLD_SIZE"
+  setServerProp "level-name" "$LEVEL"
+  setServerProp "level-seed" "$SEED"
+  setServerProp "pvp" "$PVP"
+  setServerProp "generator-settings" "$GENERATOR_SETTINGS"
+  setServerProp "online-mode" "$ONLINE_MODE"
+
+  if [ -n "$LEVEL_TYPE" ]; then
+    # normalize to uppercase
+    LEVEL_TYPE=${LEVEL_TYPE^^}
+    echo "Setting level type to $LEVEL_TYPE"
+    # check for valid values and only then set
+    case $LEVEL_TYPE in
+      DEFAULT|FLAT|LARGEBIOMES|AMPLIFIED|CUSTOMIZED)
+        sed -i "/level-type\s*=/ c level-type=$LEVEL_TYPE" /data/server.properties
+        ;;
+      *)
+        echo "Invalid LEVEL_TYPE: $LEVEL_TYPE"
+	exit 1
+	;;
+    esac
+  fi
+
+  if [ -n "$DIFFICULTY" ]; then
+    case $DIFFICULTY in
+      peaceful|0)
+        DIFFICULTY=0
+        ;;
+      easy|1)
+        DIFFICULTY=1
+        ;;
+      normal|2)
+        DIFFICULTY=2
+        ;;
+      hard|3)
+        DIFFICULTY=3
+        ;;
+      *)
+        echo "DIFFICULTY must be peaceful, easy, normal, or hard."
+        exit 1
+        ;;
+    esac
+    echo "Setting difficulty to $DIFFICULTY"
+    sed -i "/difficulty\s*=/ c difficulty=$DIFFICULTY" /data/server.properties
+  fi
+
+  if [ -n "$MODE" ]; then
+    echo "Setting mode"
+    case ${MODE,,?} in
+      0|1|2|3)
+        ;;
+      s*)
+        MODE=0
+        ;;
+      c*)
+        MODE=1
+        ;;
+      a*)
+        MODE=2
+        ;;
+      s*)
+        MODE=3
+        ;;
+      *)
+        echo "ERROR: Invalid game mode: $MODE"
+        exit 1
+        ;;
+    esac
+
+    sed -i "/gamemode\s*=/ c gamemode=$MODE" /data/server.properties
+  fi
+fi
+
+
+if [ -n "$OPS" -a ! -e ops.txt.converted ]; then
+  echo "Setting ops"
+  echo $OPS | awk -v RS=, '{print}' >> ops.txt
+fi
+
+if [ -n "$WHITELIST" -a ! -e white-list.txt.converted ]; then
+  echo "Setting whitelist"
+  echo $WHITELIST | awk -v RS=, '{print}' >> white-list.txt
+fi
+
+if [ -n "$ICON" -a ! -e server-icon.png ]; then
+  echo "Using server icon from $ICON..."
+  # Not sure what it is yet...call it "img"
+  wget -q -O /tmp/icon.img $ICON
+  specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
+  if [ "$specs" = "PNG 64x64" ]; then
+    mv /tmp/icon.img /data/server-icon.png
+  else
+    echo "Converting image to 64x64 PNG..."
+    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
+  fi
+fi
+
+# Make sure files exist to avoid errors
+if [ ! -e banned-players.json ]; then
+	echo '' > banned-players.json
+fi
+if [ ! -e banned-ips.json ]; then
+	echo '' > banned-ips.json
+fi
+
+# If any modules have been provided, copy them over
+[ -d /data/mods ] || mkdir /data/mods
+for m in /mods/*.jar
+do
+  if [ -f "$m" ]; then
+    echo Copying mod `basename "$m"`
+    cp -f "$m" /data/mods
+  fi
+done
+[ -d /data/config ] || mkdir /data/config
+for c in /config/*
+do
+  if [ -f "$c" ]; then
+    echo Copying configuration `basename "$c"`
+    cp -rf "$c" /data/config
+  fi
+done
+
+if [ "$TYPE" = "SPIGOT" ]; then
+  if [ -d /plugins ]; then
+    echo Copying any Bukkit plugins over
+    cp -r /plugins /data
+  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 "$@" $EXTRA_ARGS < /data/bootstrap.txt
+else
+    exec java $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
+fi
--- a/minecraft-server/start-minecraftFinalSetup
+++ b/minecraft-server/start-minecraftFinalSetup
@@ -1,105 +0,0 @@
-#!/bin/bash
-
-if [ -n "$OPS" -a ! -e ops.txt.converted ]; then
-  echo "Setting ops"
-  echo $OPS | awk -v RS=, '{print}' >> ops.txt
-fi
-
-if [ -n "$WHITELIST" -a ! -e white-list.txt.converted ]; then
-  echo "Setting whitelist"
-  echo $WHITELIST | awk -v RS=, '{print}' >> white-list.txt
-fi
-
-if [ -n "$ICON" -a ! -e server-icon.png ]; then
-  echo "Using server icon from $ICON..."
-  # Not sure what it is yet...call it "img"
-  curl -sSL -o /tmp/icon.img $ICON
-  specs=$(identify /tmp/icon.img | awk '{print $2,$3}')
-  if [ "$specs" = "PNG 64x64" ]; then
-    mv /tmp/icon.img /data/server-icon.png
-  else
-    echo "Converting image to 64x64 PNG..."
-    convert /tmp/icon.img -resize 64x64! /data/server-icon.png
-  fi
-fi
-
-# Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
-if [[ -z "ls *.json" ]]; then
-  echo "Checking JSON files"
-  for j in *.json; do
-    if [[ $(python -c "print open('$j').read().strip()==''") = True ]]; then
-      echo "Fixing JSON $j"
-      echo '[]' > $j
-    fi
-  done
-else
-  echo "Skipping JSON check. No files present."
-fi
-
-# If any modules have been provided, copy them over
-mkdir -p /data/mods
-for m in /mods/*.{jar,zip}
-do
-  if [ -f "$m" -a ! -f "/data/mods/$m" ]; then
-    echo Copying mod `basename "$m"`
-    cp "$m" /data/mods
-  fi
-done
-[ -d /data/config ] || mkdir /data/config
-for c in /config/*
-do
-  if [ -f "$c" ]; then
-    echo Copying configuration `basename "$c"`
-    cp -rf "$c" /data/config
-  fi
-done
-
-if [ "$TYPE" = "SPIGOT" ]; then
-  if [ -d /plugins ]; then
-    echo Copying any Bukkit plugins over
-    cp -r /plugins /data
-  fi
-fi
-
-EXTRA_ARGS=""
-# Optional disable console
-if [[ ${CONSOLE} = false || ${CONSOLE} = FALSE ]]; then
-  EXTRA_ARGS+="--noconsole"
-fi
-
-# Optional disable GUI for headless servers
-if [[ ${GUI} = false || ${GUI} = FALSE ]]; then
-  EXTRA_ARGS="${EXTRA_ARGS} nogui"
-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}}"
-
-if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
-    if [ ! -e ${FTB_DIR}/ops.json -a -e /data/ops.txt ]; then
-      cp -f /data/ops.txt ${FTB_DIR}/
-    fi
-
-    if [ ! -e ${FTB_DIR}/whitelist.json -a -e /data/white-list.txt ]; then
-      cp -f /data/white-list.txt ${FTB_DIR}/
-    fi
-
-    cp -f /data/eula.txt ${FTB_DIR}/
-
-    cat > ${FTB_DIR}/settings-local.sh <<EOF
-export MIN_RAM="${INIT_MEMORY}"
-export MAX_RAM="${MAX_MEMORY}"
-EOF
-
-    cd ${FTB_DIR}
-    echo "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
-    exec mc-server-runner ${FTB_SERVER_START}
-else
-  # If we have a bootstrap.txt file... feed that in to the server stdin
-  if [ -f /data/bootstrap.txt ]; then
-    bootstrapArgs="--bootstrap /data/bootstrap.txt"
-  fi
-
-  JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
-  exec mc-server-runner ${bootstrapArgs} java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER "$@" $EXTRA_ARGS
-fi
--- a/minecraft-server/start-utils
+++ b/minecraft-server/start-utils
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-function isURL {
-  local value=$1
-
-  if [[ ${value:0:8} == "https://" || ${value:0:7} = "http://" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function isTrue {
-  local value=${1,,}
-
-  result=
-
-  case ${value} in
-    true|on)
-      result=0
-      ;;
-    *)
-      result=1
-      ;;
-  esac
-
-  return ${result}
-}
--- a/minecraft-server/start.sh
+++ b/minecraft-server/start.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+usermod --uid $UID minecraft
+groupmod --gid $GID 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
+  }
+
+  fix_ownership /data
+  fix_ownership /home/minecraft
+fi
+
+echo "Switching to user 'minecraft'"
+exec sudo -E -u minecraft /start-minecraft "$@"
--- a/spring-boot/Dockerfile
+++ b/spring-boot/Dockerfile
@@ -1,6 +1,6 @@
 FROM itzg/gvm

-LABEL maintainer "itzg"
+MAINTAINER itzg

 RUN ["/run", "install", "springboot"]

--- a/titan-gremlin/Dockerfile
+++ b/titan-gremlin/Dockerfile
@@ -1,12 +1,11 @@
-FROM openjdk:8-jre
+FROM itzg/ubuntu-openjdk-7

-LABEL maintainer "itzg"
+MAINTAINER itzg

 ENV TITAN_VERSION 0.5.4

-ADD http://s3.thinkaurelius.com/downloads/titan/titan-$TITAN_VERSION-hadoop2.zip /tmp/titan.zip
-RUN unzip -q /tmp/titan.zip -d /opt && \
-    rm /tmp/titan.zip
+RUN wget -q -O /tmp/titan.zip http://s3.thinkaurelius.com/downloads/titan/titan-$TITAN_VERSION-hadoop2.zip
+RUN unzip -q /tmp/titan.zip -d /opt && rm /tmp/titan.zip

 ENV TITAN_HOME /opt/titan-$TITAN_VERSION-hadoop2
 WORKDIR $TITAN_HOME
--- a/titandb/Dockerfile
+++ b/titandb/Dockerfile
@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7

-LABEL maintainer "itzg"
+MAINTAINER itzg

 ENV APT_GET_UPDATE 2014-07-19

--- a/ubuntu-openjdk-7/Dockerfile
+++ b/ubuntu-openjdk-7/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:trusty

-LABEL maintainer "itzg"
+MAINTAINER itzg

 ENV APT_GET_UPDATE 2015-10-29
 RUN apt-get update
				`@@ -1 +0,0 @@`
				<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.110 Safari/537.36" version="6.4.4" editor="www.draw.io" type="github"><diagram name="Page-1">1VVNc5swEP01HDMDUiDOMbGd5pK2Ux96VkGAxgJRIRvcX9+VWD40ODOZ1j0Uz9jS2w+t3ts1Ad1W/SfNmvJNZVwGJMz6gO4CQjZRCN8WuAxA8vgwAIUW2QBFM3AQvziCGFecRMZbz9EoJY1ofDBVdc1T42FMa9X5brmS/qkNK/gKOKRMrtHvIjMlolEYzoZXLooSj97EaPjB0mOh1anG8wJCc/cM5oqNudC/LVmmugVE9wHdaqXMsKr6LZeW2pG2Ie7lHetUt+a1+UgAGQLOTJ74WHEiIfQ5E2dbn7kgJ8nPky3q2fDe3DEpijqgT+AheW5mK6wK/HVZ2obVI7ZT6ZFrCHlVrRkdoLSlzwJ2BYwo8WohXSkMPzQstfsOWhCcSlNJ2EX21JFVu8mFlFsllXahdJ/YD+Bnro0AyZ+Gu+yMslnwZjt3LVd/KurCpgptLlWbA5aBXNs0vH+X/mgSFWaFq4obfQEXDKDYBhd/2809RzeIlYt2mxwZ9nkxZZ61hgXKfV16upK+EjBMmuXmruX67KSCATMMYL2SwDU5z5DkvxAE52NNvdHqyBeOoXs8UWIbplP8A3ES3UCVja/K41oVEl5RJYpuoMr9SpU34B+Qr0rD0ITD0JE4TuI/nopwLcKLexYi6OFet6CT3Pt8TjwtCI3IFUJv0eXxis9v2y+fr/D58P/yGf87PmE7v4ycbfHCp/vf</diagram></mxfile>