[es] upgrade 2.4.x to 2.4.3

.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

.editorconfig

@@ -1,5 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-indent_style = space

README.md

@@ -1,15 +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
-
-##### ELK Stack (Elasticsearch, Logstash, Kibana)
-
-Each of the ELK components is now well supported by Elastic and the images here fell way
-behind the latest upstream releases.

build

@@ -2,9 +2,13 @@
 
 pkgs=ubuntu-openjdk-7
 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
+

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"]

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.

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

devbox/Dockerfile

@@ -0,0 +1,30 @@
+FROM itzg/ubuntu-openjdk-7
+
+RUN apt-get update
+RUN DEBIAN_FRONTEND=noninteractive \
+  apt-get install -yq git curl wget unzip openjdk-7-jdk && \
+  apt-get clean
+
+ENV MAVEN_VER 3.3.3
+ENV NODEJS_VER 0.12.7
+
+RUN wget -O /tmp/maven.tgz http://apache.mirrors.pair.com/maven/maven-3/$MAVEN_VER/binaries/apache-maven-$MAVEN_VER-bin.tar.gz
+RUN tar xvf /tmp/maven.tgz && rm /tmp/maven.tgz
+ENV M2_HOME /opt/apache-maven-$MAVEN_VER
+ENV PATH $PATH:$M2_HOME/bin
+
+RUN curl -s https://raw.githubusercontent.com/isaacs/nave/master/nave.sh > /usr/local/bin/nave
+RUN chmod +x /usr/local/bin/nave
+RUN nave usemain latest
+
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+VOLUME ["/shared"]
+
+RUN useradd -m -d /home/developer developer
+
+USER developer
+RUN curl -s get.gvmtool.net | bash
+
+WORKDIR /home/developer
+CMD bash

devbox/README.md

@@ -0,0 +1,25 @@
+Provides a development/build environment for Java, Groovy, and NodeJS.
+
+* Provides 'gvm' for Groovy (and more) installation management
+* Provides 'nave' for NodeJS installation management
+* Pre-installs the latest NodeJS via nave
+
+## Using the persistent/shared workarea
+
+Since devbox containers are intended to be disposable, the image is configured 
+with a "volume" at `/shared`. 
+
+There are a couple of ways you can leverage that volume. Either attach it to
+a host-local directory:
+
+    docker run -it -v $(pwd)/workarea:/shared --rm itzg/devbox
+
+or run a "base" container and mounts the `/shared` from that onto any
+subsequent containers:
+
+    docker run --name devbox-base itzg/devbox touch /shared/READY
+    ...later...
+    docker run -it --volumes-from devbox-base --rm itzg/devbox
+
+**NOTE** I am using the `--rm` option so the devbox containers will be truly
+"burn after use".

elasticsearch-marvel/README.md

@@ -0,0 +1,5 @@
+**This image is now deprecated. **
+
+Please use [itzg/elasticsearch](https://registry.hub.docker.com/u/itzg/elasticsearch/)
+instead. See the plugins configuration section for that image to see how
+to install Marvel.

elasticsearch/Dockerfile

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

elasticsearch/README.md

@@ -0,0 +1,199 @@
+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.
+
+# Basic Usage
+
+To start an Elasticsearch data node that listens on the standard ports on your host's network interface:
+
+    docker run -d -p 9200:9200 -p 9300:9300 itzg/elasticsearch
+
+You'll then be able to connect to the Elasticsearch HTTP interface to confirm it's alive:
+
+http://DOCKERHOST:9200/
+
+    {
+      "status" : 200,
+      "name" : "Charon",
+      "version" : {
+        "number" : "1.3.5",
+        "build_hash" : "4a50e7df768fddd572f48830ae9c35e4ded86ac1",
+        "build_timestamp" : "2014-11-05T15:21:28Z",
+        "build_snapshot" : false,
+        "lucene_version" : "4.9"
+      },
+      "tagline" : "You Know, for Search"
+    }
+
+Where `DOCKERHOST` would be the actual hostname of your host running Docker.
+
+# Simple, multi-node cluster
+
+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                    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
+
+    {
+      "cluster_name" : "elasticsearch",
+      "status" : "green",
+      "timed_out" : false,
+      "number_of_nodes" : 3,
+      "number_of_data_nodes" : 3,
+      "active_primary_shards" : 0,
+      "active_shards" : 0,
+      "relocating_shards" : 0,
+      "initializing_shards" : 0,
+      "unassigned_shards" : 0
+    }
+
+# Configuration Summary
+
+## Ports
+
+* `9200` - HTTP REST
+* `9300` - Native transport
+
+## Volumes
+
+* `/data` - location of `path.data`
+* `/conf` - location of `path.conf`
+
+# Configuration Details
+
+The following configuration options are specified using `docker run` environment variables (`-e`) like
+
+    docker run ... -e NAME=VALUE ... itzg/elasticsearch
+
+Since Docker's `-e` settings are baked into the container definition, this image provides an extra feature to change any of the settings below for an existing container. Either create/edit the file `env` in the `/conf` volume mapping or edit within the running container's context using:
+
+    docker exec -it CONTAINER_ID vi /conf/env
+
+replacing `CONTAINER_ID` with the container's ID or name.
+
+The contents of the `/conf/env` file are standard shell
+
+    NAME=VALUE
+
+entries where `NAME` is one of the variables described below.
+
+Configuration options not explicitly supported below can be specified via the `OPTS` environment variable. For example, by default `OPTS` is set with
+
+    OPTS=-Dnetwork.bind_host=_non_loopback_
+
+_NOTE: That option is a default since `bind_host` defaults to `localhost` as of 2.0, which isn't helpful for
+port mapping out from the container_.
+
+## Cluster Name
+
+If joining a pre-existing cluster, then you may need to specify a cluster name different than the default "elasticsearch":
+
+    -e CLUSTER=dockers
+
+## Zen Unicast Hosts
+
+When joining a multi-physical-host cluster, multicast may not be supported on the physical network. In that case, your node can reference specific one or more hosts in the cluster via the [Zen Unicast Hosts](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html#unicast) capability as a comma-separated list of `HOST:PORT` pairs:
+
+    -e UNICAST_HOSTS=HOST:PORT[,HOST:PORT]
+
+such as
+
+    -e UNICAST_HOSTS=192.168.0.100:9300
+
+## Plugins
+
+You can install one or more plugins before startup by passing a comma-separated list of plugins.
+
+    -e PLUGINS=ID[,ID]
+
+In this example, it will install the Marvel plugin
+
+    -e PLUGINS=elasticsearch/marvel/latest
+
+Many more plugins [are available here](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-plugins.html#known-plugins).
+
+## Publish As
+
+Since the container gives the Elasticsearch software an isolated perspective of its networking, it will most likely advertise its published address with a container-internal IP address. This can be overridden with a physical networking name and port using:
+
+    -e PUBLISH_AS=DOCKERHOST:9301
+
+_Author Note: I have yet to hit a case where this was actually necessary. Other
+than the cosmetic weirdness in the logs, Elasticsearch seems to be quite tolerant._
+
+## Node Name
+
+Rather than use the randomly assigned node name, you can indicate a specific one using:
+
+    -e NODE_NAME=Docker
+
+## Node Type
+
+If you refer to [the Node section](https://www.elastic.co/guide/en/elasticsearch/reference/2.3/modules-node.html)
+of the Elasticsearch reference guide, you'll find that there's three main types of nodes: master-eligible, data, and client.
+
+In larger clusters it is important to dedicate a small number (>= 3) of master nodes. There are also cases where a large cluster may need dedicated gateway nodes that are neither master nor data nodes and purely operate as "smart routers" and have large amounts of CPU and memory to handle client requests and search-reduce.
+
+To simplify all that, this image provides a `TYPE` variable to let you amongst these combinations. The choices are:
+
+* (not set, the default) : the default node type which is both master-eligible and a data node
+* `MASTER` : master-eligible, but holds no data. It is good to have three or more of these in a
+large cluster
+* `DATA` (or `NON_MASTER`) : holds data and serves search/index requests. Scale these out for elastic-y goodness.
+* `GATEWAY` : only operates as a client node or a "smart router". These are the ones whose HTTP port 9200 will need to be exposed
+
+A [Docker Compose](https://docs.docker.com/compose/overview/) file will serve as a good example of these three node types:
+
+```
+version: '2'
+
+services:
+  gateway:
+    image: itzg/elasticsearch
+    environment:
+      UNICAST_HOSTS: master
+      TYPE: GATEWAY
+    ports:
+      - "9200:9200"
+
+  master:
+    image: itzg/elasticsearch
+    environment:
+      UNICAST_HOSTS: gateway
+      TYPE: MASTER
+      MIN_MASTERS: 2
+
+  data:
+    image: itzg/elasticsearch
+    environment:
+      UNICAST_HOSTS: master,gateway
+      TYPE: DATA
+```
+
+## Minimum Master Nodes
+
+In combination with the `TYPE` variable above, you will also want to configure the minimum master nodes to [avoid split-brain](https://www.elastic.co/guide/en/elasticsearch/reference/2.3/modules-node.html#split-brain) during network outages.
+
+The minimum, which can be calculated as `(master_eligible_nodes / 2) + 1`, can be set with the `MIN_MASTERS` variable.
+
+Using the Docker Compose file above, a value of `2` is appropriate when scaling the cluster to 3 master nodes:
+
+    docker-compose scale master=3
+
+## Auto transport/http discovery with Swarm Mode
+
+When using Docker Swarm mode (starting with 1.12), the overlay and ingress network interfaces are assigned
+multiple IP addresses. As a result, it creates confusion for the transport publish logic even when using
+the special value `_eth0_`.
+
+To resolve this, add
+
+    -e DISCOVER_TRANSPORT_IP=eth0
+
+replacing `eth0` with another interface within the container, if needed.
+
+The same can be done for publish/binding of the http module by adding:
+
+    -e DISCOVERY_HTTP_IP=eth2

elasticsearch/start

@@ -0,0 +1,112 @@
+#!/bin/sh
+
+if [ -f /conf/env ]; then
+  . /conf/env
+fi
+
+if [ ! -e /conf/elasticsearch.* ]; then
+  cp $ES_HOME/config/elasticsearch.yml /conf
+fi
+
+if [ ! -e /conf/logging.* ]; then
+  cp $ES_HOME/config/logging.yml /conf
+fi
+
+OPTS="$OPTS -Des.path.conf=/conf \
+  -Des.path.data=/data \
+  -Des.path.logs=/data \
+  -Des.transport.tcp.port=9300 \
+  -Des.http.port=9200"
+
+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
+  discoverIpFromLink $DISCOVER_HTTP_IP http
+fi
+
+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
+
+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
+  set -x
+  su -c "$CMD" $DEFAULT_ES_USER
+else
+  $CMD
+fi

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"]

gvm/Dockerfile

@@ -0,0 +1,12 @@
+FROM itzg/ubuntu-openjdk-7
+
+MAINTAINER itzg
+
+RUN apt-get install -y curl unzip
+
+RUN curl -s get.gvmtool.net | bash
+
+ADD run /run
+ONBUILD RUN ["/run", "selfupdate"]
+
+ENTRYPOINT ["/run"]

gvm/run

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. /etc/profile.d/*
+. /.gvm/bin/gvm-init.sh
+
+gvm $*

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"]
+

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"]

kibana/Dockerfile

@@ -0,0 +1,21 @@
+FROM itzg/ubuntu-openjdk-7
+
+MAINTAINER itzg
+
+ENV KIBANA_VERSION 4.1.1
+
+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-x64
+
+# Simplify for cross-container
+ENV ES_URL http://es:9200
+
+WORKDIR $KIBANA_HOME
+
+ADD start.sh /start
+
+EXPOSE 5601
+
+CMD ["/start"]

kibana/README.md

@@ -0,0 +1,26 @@
+
+Provides a ready-to-run [Kibana](http://www.elasticsearch.org/overview/kibana/) server that can
+easily hook into your [Elasticsearch containers](https://registry.hub.docker.com/u/itzg/elasticsearch/).
+
+## Usage with Docker elasticsearch container
+
+This is by far the easiest and most Docker'ish way to run Kibana.
+
+Assuming you started one or more containers using something like
+
+    docker run -d --name your-es -p 9200:9200 itzg/elasticsearch
+
+Start Kibana using
+
+    docker run -d -p 5601:5601 --link your-es:es itzg/kibana
+
+Proceed to use Kibana starting from 
+[this point in the documentation](http://www.elasticsearch.org/guide/en/kibana/current/access.html)
+
+## Usage with non-Docker elasticsearch
+
+Start Kibana using
+
+    docker run -d -p 5601:5601 -e ES_URL=http://YOUR_ES:9200 itzg/kibana
+
+Replacing `http://YOUR_ES:9200` with the appropriate URL for your system.

kibana/start.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+OPTS="-e $ES_URL"
+
+exec bin/kibana $OPTS
+

logstash/Dockerfile

@@ -0,0 +1,25 @@
+FROM itzg/ubuntu-openjdk-7
+
+MAINTAINER itzg
+
+ENV LOGSTASH_VERSION 1.5.0-1
+
+RUN wget -qO /tmp/logstash.deb http://download.elastic.co/logstash/logstash/packages/debian/logstash_${LOGSTASH_VERSION}_all.deb
+
+RUN dpkg -i /tmp/logstash.deb && rm /tmp/logstash.deb
+
+WORKDIR /opt/logstash
+
+# For collectd reception
+EXPOSE 25826
+
+# /conf is the default directory where our logstash will read pipeline config files
+# /logs is an optional attach point to reference something like /var/log on the host
+VOLUME ["/conf","/logs"]
+
+ENV PLUGIN_UPDATES 2015-06-10
+
+RUN bin/plugin install logstash-input-heartbeat
+RUN bin/plugin install logstash-output-elasticsearch_groom
+
+CMD ["bin/logstash","agent","-f","/conf"]

logstash/README.md

@@ -0,0 +1,44 @@
+This image bundles the latest (1.5.x) version of Logstash with the ability to
+groom its own Elasticsearch indices.
+
+# Basic Usage
+
+To start a Logstash container, setup a directory on your host with one or more Logstash
+pipeline configurations files, called `$HOST_CONF` here, and run
+
+    docker run -d -v $HOST_CONF:/conf itzg/logstash
+
+# Accessing host logs
+
+Logstash is much more useful when it is actually processing...logs. Logs inside the container
+are non-existent, but you can attach the host machine's `/var/log` directory via the container's
+`/logs` volume:
+
+    docker run ... -v /var/log:/logs ...
+
+Keep in mind you will need to configure `file` inputs with a base path of `/logs`, such as
+
+```
+file {
+  path => ['/logs/syslog']
+  type => 'syslog'
+}
+```
+
+# Receiving input from collectd
+
+To allow for incoming [collectd](https://collectd.org/) content, **UDP** port 25826 is exposed and
+can be mapped onto the host using:
+
+    docker run ... -p 25826:25826/udp
+
+Regardless of the host port, be sure to configure the logstash input to bind at port `25826`, such
+as
+
+```
+udp {
+  port => 25826
+  codec => collectd { }
+  buffer_size => 1452
+}
+```

logstash/conf/example.conf

@@ -0,0 +1,25 @@
+input {
+  heartbeat {
+    type => 'groom'
+    interval => 11
+    add_field => {
+      scope => 'open'
+      cutoff => '4w'
+      action => 'close'
+    }
+  }
+}
+
+output {
+
+  if [type] == 'groom' {
+    elasticsearch_groom {
+      host => 'es:9200'
+      index => 'logstash-%{+YYYY.MM.dd}'
+      scope => '%{scope}'
+      age_cutoff => '%{cutoff}'
+      action => '%{action}'
+    }
+  }
+}
+

minecraft-server/.editorconfig

@@ -1,2 +0,0 @@
-[start-*]
-indent_size = 2

minecraft-server/Dockerfile

@@ -1,85 +1,43 @@
-FROM openjdk:8u212-jre-alpine
+FROM java:8
 
-LABEL maintainer "itzg"
+MAINTAINER itzg
 
-RUN apk add --no-cache -U \
-  openssl \
+ENV APT_GET_UPDATE 2016-04-23
+RUN apt-get update
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
   imagemagick \
   lsof \
-  su-exec \
-  shadow \
-  bash \
-  curl iputils wget \
-  git \
-  jq \
-  mysql-client \
-  tzdata \
-  rsync \
   nano \
-  python python-dev py2-pip
+  sudo \
+  vim \
+  jq \
+  && apt-get clean
 
-RUN pip install mcstatus yq
-
-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
 
-RUN echo 'hosts: files dns' > /etc/nsswitch.conf
-
-ARG RESTIFY_VER=1.1.6
-ARG RCON_CLI_VER=1.4.6
-ARG MC_SERVER_RUNNER_VER=1.3.2
-ARG TOF_BUILDTOOLS_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://git.faldoria.de/tof/server/build-tools/-/jobs/artifacts/buildtools-${TOF_BUILDTOOLS_VER}/raw/target/ToF-BuildTools.jar?job=release-artifact /tmp/tof-buildtools/BuildTools.jar
-
-ONBUILD ARG BUILDTOOLS_OUTPUT=/plugins
-ONBUILD COPY *Dockerfile* *plugins.yml /tmp/tof-buildtools/
-ONBUILD RUN \
-  [ -d /tmp/tof-buildtools ] && \
-  [ $(find /tmp/tof-buildtools -type f -name plugins.yml | wc -l) -gt 0 ] && \
-  java -jar /tmp/tof-buildtools/BuildTools.jar \
-    --config "/tmp/tof-buildtools/plugins.yml" \
-    --configs "plugins.yml" \
-    --dir "/tmp/tof-buildtools/" \
-    --output ${BUILDTOOLS_OUTPUT} && \
-  chown -R minecraft:minecraft ${BUILDTOOLS_OUTPUT} && \
-  rm -fR /tmp/tof-buildtools/ || \
-  true
-
+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"]
+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= FABRICVERSION=LATEST LEVEL=world \
-  PVP=true DIFFICULTY=easy ENABLE_RCON=true RCON_PORT=25575 RCON_PASSWORD=minecraft \
-  LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK= MODS= SERVER_PORT=25565 ONLINE_MODE=TRUE CONSOLE=true SERVER_NAME="Dedicated Server" \
-  REPLACE_ENV_VARIABLES="FALSE" ENV_VARIABLE_PREFIX="CFG_"
-
-COPY start* /
-RUN dos2unix /start* && chmod +x /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

minecraft-server/Minecraft server containment.xml

@@ -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>

minecraft-server/README.md

@@ -1,9 +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)
-[![](https://img.shields.io/gitter/room/itzg/dockerfiles.svg?style=flat)](https://gitter.im/itzg/dockerfiles)
-[![](https://img.shields.io/badge/Donate-Buy%20me%20a%20coffee-orange.svg)](https://www.buymeacoffee.com/itzg)
 
 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,33 +33,8 @@ With that you can easily view the logs, stop, or re-start the container:
 
     docker start mc
 
-## Looking for a Bedrock Dedicated Server
-
-For Minecraft clients running on consoles, mobile, or native Windows, you'll need to
-use this image instead:
-
-[itzg/minecraft-bedrock-server](https://hub.docker.com/r/itzg/minecraft-bedrock-server)
-
 ## 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
@@ -100,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
@@ -116,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.
@@ -154,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
@@ -210,84 +151,6 @@ This works well if you want to have a common set of modules in a separate
 location, but still have multiple worlds with different server requirements
 in either persistent volumes or a downloadable archive.
 
-### Replacing variables inside configs
-
-Sometimes you have mods or plugins that require configuration information that is only available at runtime.
-For example if you need to configure a plugin to connect to a database,
-you don't want to include this information in your Git repository or Docker image.
-Or maybe you have some runtime information like the server name that needs to be set
-in your config files after the container starts.
-
-For those cases there is the option to replace defined variables inside your configs
-with environment variables defined at container runtime.
-
-If you set the enviroment variable `REPLACE_ENV_VARIABLES` to `TRUE` the startup script
-will go thru all files inside your `/data` volume and replace variables that match your 
-defined environment variables. Variables that you want to replace need to be wrapped
-inside `${YOUR_VARIABLE}` curly brackets and prefixed with a dollar sign. This is the regular
-syntax for enviromment variables inside strings or config files.
-
-Optionally you can also define a prefix to only match predefined enviroment variables.
-
-`ENV_VARIABLE_PREFIX="CFG_"` <-- this is the default prefix
-
-There are some limitations to what characters you can use.
-
-| Type  | Allowed Characters  |
-| ----- | ------------------- |
-| Name  | `0-9a-zA-Z_-`       |
-| Value | `0-9a-zA-Z_-:/=?.+` |
-
-Here is a full example where we want to replace values inside a `database.yml`.
-
-```yml
-...
-database:
-    host: ${CFG_DB_HOST}
-    name: ${CFG_DB_NAME}
-    password: ${CFG_DB_PASSWORD}
-```
-
-This is how your `docker-compose.yml` file could look like:
-
-```yml
-version: '3'
-# Other docker-compose examples in /examples
-
-services:
-  minecraft:
-    image: itzg/minecraft-server
-    ports:
-      - "25565:25565"
-    volumes:
-      - "mc:/data"
-    environment:
-      EULA: "TRUE"
-      ENABLE_RCON: "true"
-      RCON_PASSWORD: "testing"
-      RCON_PORT: 28016
-      # enable env variable replacement
-      REPLACE_ENV_VARIABLES: "TRUE"
-      # define an optional prefix for your env variables you want to replace
-      ENV_VARIABLE_PREFIX: "CFG_"
-      # and here are the actual variables
-      CFG_DB_HOST: "http://localhost:3306"
-      CFG_DB_NAME: "minecraft"
-      CFG_DB_PASSWORD: "ug23u3bg39o-ogADSs"
-    restart: always
-  rcon:
-    image: itzg/rcon
-    ports:
-      - "4326:4326"
-      - "4327:4327"
-    volumes:
-      - "rcon:/opt/rcon-web-admin/db"
-
-volumes:
-  mc:
-  rcon:
-```
-
 ## Running a Bukkit/Spigot server
 
 Enable Bukkit/Spigot server mode by adding a `-e TYPE=BUKKIT -e VERSION=1.8` or `-e TYPE=SPIGOT -e VERSION=1.8` to your command-line.
@@ -296,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
@@ -350,15 +209,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.
 
-### Building an image with plugins
-
-You can also create your own Docker images by extending the `itzg/minecraft-server` image.
-The image contains an `ONBUILD` trigger that will copy a `plugins.yml` file from you build directory and download any plugins specified in it.
-
-You can read about the [`ToF-BuildTools` and how to use them here](https://git.faldoria.de/tof/server/build-tools).
-
-You can also find [an example](examples/ToF-build/) with a custom image in the examples dir.
-
 ## Running a PaperSpigot server
 
 Enable PaperSpigot server mode by adding a `-e TYPE=PAPER -e VERSION=1.9.4` to your command-line.
@@ -374,14 +224,8 @@ 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...
 
-An example compose file is provided at 
-[examples/docker-compose-paper.yml](examples/docker-compose-paper.yml).
-
 ### Using the /data volume
 
 This is the easiest way if you are using a persistent `/data` mount.
@@ -420,211 +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) / CurseForge modpack
-
-Enable this server mode by adding a `-e TYPE=FTB` or `-e TYPE=CURSEFORGE` to your command-line,
-but note the following additional steps needed...
-
-You need to specify a modpack to run, using the `FTB_SERVER_MOD` or `CF_SERVER_MOD` environment
-variable. An FTB/CurseForge server modpack is available together with its respective
-client modpack on https://www.feed-the-beast.com under "Additional Files." Similar you can
-locate the modpacks for CurseForge at https://minecraft.curseforge.com/modpacks .
-
-There are a couple of options for obtaining an FTB/CurseForge modpack. 
-One options is that you can pre-download the **server** modpack and 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 pre-downloading a modpack from the FTB/CurseForge site, you
-can you set `FTB_SERVER_MOD` (or `CF_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
-
-or for a CurseForce modpack:
-
-    docker run ... \
-      -e TYPE=CURSEFORGE \
-      -e CF_SERVER_MOD=https://minecraft.curseforge.com/projects/enigmatica2expert/files/2663153/download
-
-### 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
-
-### Using a client-made curseforge modpack
-
-If you use something like curseforge, you may end up creating/using modpacks that do not
-contain server mod jars. Instead, the curseforge setup has `manifest.json` files, which
-will show up under `/data/FeedTheBeast/manifest.json`.
-
-To use these packs you will need to:
-
-- Specify the manifest location with env var `MANIFEST=/data/FeedTheBeast/manifest`
-- Pick a relevant ServerStart.sh and potentially settings.cfg and put them in `/data/FeedTheBeast`
-
-An example of the latter would be to use https://github.com/AllTheMods/Server-Scripts
-There, you'll find that all you have to do is put `ServerStart.sh` and `settings.cfg` into
-`/data/FeedTheBeast`, taking care to update `settings.cfg` to specify your desired version
-of minecraft and forge. You can do this in the cli with something like:
-
-```
-$ wget https://raw.githubusercontent.com/AllTheMods/Server-Scripts/master/ServerStart.sh
-$ wget https://raw.githubusercontent.com/AllTheMods/Server-Scripts/master/settings.cfg
-$ vim settings.cfg #update the forge version to the one you want. Your manifest.json will have it
-$ chmod +x ServerStart.sh
-$ docker run -itd --name derpcraft \
-  -e MANIFEST=/data/FeedTheBeast/manifest.json \
-  -v $PWD/ServerStart.sh:/data/FeedTheBeast/ServerStart.sh \
-  -v $PWD/settings.cfg:/data/FeedTheBeast/settings.cfg \
-  -e VERSION=1.12.2\
-  -e TYPE=CURSEFORGE\
-  -e CF_SERVER_MOD=https://minecraft.curseforge.com/projects/your_amazing_modpack/files/2670435/download\
-  -p 25565:25565\
-  -e EULA=TRUE\
-  --restart=always\
-  itzg/minecraft-server
-```
-
-Note the `CF_SERVER_MOD` env var should match the url to download the modpack you are targeting.
-
-## 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 ...
-
-## Running a Fabric Server
-
-Enable Fabric server mode by adding a `-e TYPE=FABRIC` to your command-line.
-By default the container will run the latest version of [Fabric server](http://fabricmc.net/use/)
-but you can also choose to run a specific version with `-e FABRICVERSION=0.5.0.32`.
-
-    $ docker run -d -v /path/on/host:/data -e VERSION=1.14.3 \
-        -e TYPE=FABRIC -e FABRICVERSION=0.5.0.32 \
-        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
-
-To use a pre-downloaded Fabric installer, place it in the attached `/data` directory and
-specify the name of the installer file with `FABRIC_INSTALLER`, such as:
-
-    $ docker run -d -v /path/on/host:/data ... \
-        -e FABRIC_INSTALLER=fabric-installer-0.5.0.32.jar ...
-
-To download a Fabric installer from a custom location, such as your own file repository, specify
-the URL with `FABRIC_INSTALLER_URL`, such as:
-
-    $ docker run -d -v /path/on/host:/data ... \
-        -e FORGE_INSTALLER_URL=http://HOST/fabric-installer-0.5.0.32.jar ...
-
-In both of the cases above, there is no need for the `VERSION` or `FABRICVERSION` variables.
-
-In order to add mods, you have two options.
-
-### Using the /data volume
-
-This is the easiest way if you are using a persistent `/data` mount.
-
-To do this, you will need to attach the container's `/data` directory
-(see "Attaching data directory to host filesystem”).
-Then, you can add mods to the `/path/on/host/mods` folder you chose. From the example above,
-the `/path/on/host` folder contents look like:
-
-```
-/path/on/host
-├── mods
-│   └── ... INSTALL MODS HERE ...
-├── config
-│   └── ... CONFIGURE MODS HERE ...
-├── ops.json
-├── server.properties
-├── whitelist.json
-└── ...
-```
-
-If you add mods while the container is running, you'll need to restart it to pick those
-up:
-
-    docker stop mc
-    docker start mc
-
-### Using separate mounts
-
-This is the easiest way if you are using an ephemeral `/data` filesystem,
-or downloading a world with the `WORLD` option.
-
-There are two additional volumes that can be mounted; `/mods` and `/config`.  
-Any files in either of these filesystems will be copied over to the main
-`/data` filesystem before starting Minecraft.
-
-This works well if you want to have a common set of modules in a separate
-location, but still have multiple worlds with different server requirements
-in either persistent volumes or a downloadable archive.
-
-## Running with a custom server JAR
-
-If you would like to run a custom server JAR, set `-e TYPE=CUSTOM` and pass the custom server
-JAR via `CUSTOM_SERVER`. It can either be a URL or a container path to an existing JAR file. 
-
-If it is a URL, it will only be downloaded into the `/data` directory if it wasn't already. As
-such, if you need to upgrade or re-download the JAR, then you will need to stop the container,
-remove the file from the container's `/data` directory, and start again. 
-
-## Force re-download of the server file
-
-For VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, CURSEFORGE, SPONGEVANILLA server types, set 
-`$FORCE_REDOWNLOAD` to some value (e.g. 'true) to force a re-download of the server file for 
-the particular server type. by adding a `-e FORCE_REDOWNLOAD=true` to your command-line.
-
-For example, with PaperSpigot, it would look something like this:
-
-```
-docker run -d -v /path/on/host:/data \
-    -e TYPE=PAPER -e VERSION=1.14.1 -e FORCE_REDOWNLOAD=true \
-    -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
-```
-
 ## Using Docker Compose
 
 Rather than type the server options below, the port mappings above, etc
@@ -651,38 +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
 
-By default the server configuration will be created and set based on the following
-environment variables, but only the first time the server is started. If the
-`server.properties` file already exists, the values in them will not be changed.
-
-If you would like to override the server configuration each time the container
-starts up, you can set the OVERRIDE_SERVER_PROPERTIES environment variable like:
-
-    docker run -d -e OVERRIDE_SERVER_PROPERTIES=true ...
-
-This will reset any manual configuration of the `server.properties` file, so if
-you want to make any persistent configuration changes you will need to make sure
-you have properly set the proper environment variables in your docker run command (described below).
-
-### Server name
-
-The server name (e.g. for bungeecord) can be set like:
-
-    docker run -d -e SERVER_NAME=MyServer ...
-
-### 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:
@@ -763,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
 
@@ -784,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.
@@ -856,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
 
@@ -875,18 +475,17 @@ environment variable set to `false`, such as
 ### Level Type and Generator Settings
 
 By default, a standard world is generated with hills, valleys, water, etc. A different level type can
-be configured by setting `LEVEL_TYPE` to an expected type, such as
+be configured by setting `LEVEL_TYPE` to
 
 * DEFAULT
 * FLAT
 * 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.**
 
@@ -926,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"
@@ -951,74 +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.
 
-You may also download individual mods using the `MODS` environment variable and supplying the URL
-to the jar files. Multiple mods/plugins should be comma separated.
-
-    docker run -d -e MODS=https://www.example.com/mods/mod1.jar,https://www.example.com/mods/mod2.jar ... 
-
-### 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 ...
-
-**WARNING:** All content of the `mods` or `plugins` directory will be deleted
-before unpacking new content from the MODPACK or MODS. 
-
 ### 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.
-
-For some cases, if e.g. after removing mods, it could be necessary to startup minecraft with an additional `-D` parameter like `-Dfml.queryResult=confirm`. To address this you can use the environment variable `JVM_DD_OPTS`, which builds the params from a given list of values separated by space, but without the `-D` prefix. To make things running under systems (e.g. Plesk), which doesn't allow `=` inside values, a `:` (colon) could be used instead. The upper example would look like this:
-`JVM_DD_OPTS=fml.queryResult:confirm`, and will be converted to `-Dfml.queryResult=confirm`. 
-
-### 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`.

minecraft-server/docker-compose.yml

@@ -1,28 +1,14 @@
-version: '3'
-# Other docker-compose examples in /examples
+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

minecraft-server/examples/ToF-build/Dockerfile

@@ -1,3 +0,0 @@
-FROM itzg/minecraft-server
-
-ENV TYPE=SPIGOT

minecraft-server/examples/ToF-build/plugins.yml

@@ -1,13 +0,0 @@
-plugins:
-  worldedit:
-    file: WorldEdit.jar
-    url: https://dev.bukkit.org/projects/worldedit/files/latest
-  FastAsyncWorldEdit:
-    file: FastAsyncWorldEdit.jar
-    url: https://empcraft.com/fawe/latest.php?bukkit
-  worldguard:
-    file: WorldGuard.jar
-    url: https://dev.bukkit.org/projects/worldguard/files/latest
-  citizens:
-    file: Citizens.jar
-    url: https://dev.bukkit.org/projects/citizens/files/latest

minecraft-server/examples/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:

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

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:

minecraft-server/examples/docker-compose-paper.yml

@@ -1,17 +0,0 @@
-version: '3.7'
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      TYPE: PAPER
-      VERSION: 1.9.4
-    command: --noconsole
-    ports:
-      - 25565:25565
-    volumes:
-      - mc-paper:/data
-
-volumes:
-  mc-paper:

minecraft-server/examples/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
-

minecraft-server/examples/docker-compose-spongeforge.yml

@@ -1,34 +0,0 @@
-version: '3'
-# Forge with Sponge API support. THIS REQUIRES DOWNLOADING SPONGEFORGE.
-# Place the SpongeForge jar file in /data/mods. Other Forge mods go here as well.
-# Place Sponge mods in /data/mods/plugins. Yes, this is a directory inside the Forge mod directory. Do NOT use /data/plugins.
-
-services:
-  minecraft:
-    image: itzg/minecraft-server
-    ports:
-      - "25565:25565"
-    volumes:
-      - "mc:/data"
-    environment:
-      EULA: "TRUE"
-      #VERSION: "1.12.2" (Ensure this is compatbile with the version of SpongeForge you are using!)
-      TYPE: "FORGE"
-      FORGEVERSION: "RECOMMENDED"
-      #FORGEVERSION: "14.23.5.2807"
-      CONSOLE: "false"
-      ENABLE_RCON: "true"
-      RCON_PASSWORD: "testing"
-      RCON_PORT: 28016
-    restart: unless-stopped
-  rcon:
-    image: itzg/rcon
-    ports:
-      - "4326:4326"
-      - "4327:4327"
-    volumes:
-      - "rcon:/opt/rcon-web-admin/db"
-
-volumes:
-  mc:
-  rcon:

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: {}

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

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 -o -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

minecraft-server/start-configuration

@@ -1,106 +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 $@
-  ;;
-
-  FABRIC)
-    exec /start-deployFabric $@
-  ;;
-
-  FTB|CURSEFORGE)
-    exec /start-deployFTB $@
-  ;;
-
-  VANILLA)
-    exec /start-deployVanilla $@
-  ;;
-
-  SPONGEVANILLA)
-    exec /start-deploySpongeVanilla $@
-  ;;
-
-  CUSTOM)
-    exec /start-deployCustom $@
-  ;;
-
-  *)
-      echo "Invalid type: '$TYPE'"
-      echo "Must be: VANILLA, FORGE, BUKKIT, SPIGOT, PAPER, FTB, CURSEFORGE, SPONGEVANILLA"
-      exit 1
-  ;;
-
-esac

minecraft-server/start-deployBukkitSpigot

@@ -1,87 +0,0 @@
-#!/bin/bash
-
-set -e
-
-function buildSpigotFromSource {
-  echo "Building Spigot $VANILLA_VERSION from source, might take a while, get some coffee"
-  mkdir /data/temp
-  cd /data/temp
-
-  jvmOpts="-Xms${INIT_MEMORY:-$MEMORY} -Xmx${MAX_MEMORY:-$MEMORY}"
-
-  curl -sSL -o /data/temp/BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && \
-    java $jvmOpts -jar /data/temp/BuildTools.jar --rev $VANILLA_VERSION 2>&1 |tee /data/spigot_build.log| while read l; do echo -n .; done; echo "done"
-  if ! mv spigot-*.jar /data/spigot_server.jar; then
-    echo "ERR failed to build Spigot"
-    cat /data/spigot_build.log
-    exit 1
-  fi
-  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 ] || [ -n "$FORCE_REDOWNLOAD" ]; 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 $@

minecraft-server/start-deployCustom

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-if isURL ${CUSTOM_SERVER}; then
-  filename=$(basename ${CUSTOM_SERVER})
-  export SERVER=/data/${filename}
-
-  if [[ -f ${SERVER} ]] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    echo "Using previously downloaded jar at ${SERVER}"
-  else
-   echo "Downloading custom server jar from ${CUSTOM_SERVER} ..."
-   if ! curl -sSL -o ${SERVER} ${CUSTOM_SERVER}; then
-      echo "Failed to download from ${CUSTOM_SERVER}"
-      exit 2
-    fi
-  fi
-
-elif [[ -f ${CUSTOM_SERVER} ]]; then
-  echo "Using custom server jar at ${CUSTOM_SERVER} ..."
-  export SERVER=${CUSTOM_SERVER}
-
-else
-  echo "CUSTOM_SERVER is not properly set to a URL or existing jar file"
-  exit 2
-fi
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@

minecraft-server/start-deployFTB

@@ -1,130 +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
-
-FTB_SERVER_MOD=${FTB_SERVER_MOD:-$CF_SERVER_MOD}
-
-echo "Looking for Feed-The-Beast / CurseForge 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
-
-entryScriptExpr="-name ServerStart.sh -o -name ServerStartLinux.sh -o -name LaunchServer.sh"
-
-if [[ -d ${FTB_BASE_DIR} ]]; then
-  startScriptCount=$(find ${FTB_BASE_DIR} $entryScriptExpr |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://www.curseforge.com/minecraft/modpacks/*/download/*/file)
-          ;;
-        https://www.curseforge.com/minecraft/modpacks/*/download/*)
-          srv_modpack=${srv_modpack}/file;;
-        https://www.feed-the-beast.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} $entryScriptExpr | wc -l) = 0 ]]; then
-
-    forgeJar=$(find ${FTB_BASE_DIR} -name 'forge*.jar' -a -not -name 'forge*installer')
-    if [[ "$forgeJar" ]]; then
-      export FTB_BASE_DIR=$(dirname "${forgeJar}")
-      echo "No entry script found, so building one for ${forgeJar}"
-      cat > "${FTB_BASE_DIR}/ServerStart.sh" <<EOF
-#!/bin/sh
-. ./settings-local.sh
-java \${JAVA_PARAMETERS} -Xmx\${MAX_RAM} -jar $(basename "${forgeJar}") nogui
-EOF
-      chmod +x "${FTB_BASE_DIR}/ServerStart.sh"
-    else
-      echo "Please make sure you are using the server version of the FTB modpack!"
-      exit 2
-    fi
-fi
-
-scriptCount=$(find "${FTB_BASE_DIR}" $entryScriptExpr | wc -l)
-if [[ $scriptCount = 0 ]]; then
-    echo "Please make sure you are using the server version of the FTB modpack!"
-    exit 2
-elif [[ $scriptCount > 1 ]]; then
-    echo "Ambigous startup scripts in FTB modpack!"
-    echo "found:"
-    find ${FTB_BASE_DIR} $entryScriptExpr
-    exit 2
-fi
-
-export FTB_SERVER_START=$(find "${FTB_BASE_DIR}" $entryScriptExpr)
-
-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 $@

minecraft-server/start-deployFabric

@@ -1,72 +0,0 @@
-#!/bin/bash
-set -u
-
-export TYPE=FABRIC
-
-FABRIC_INSTALLER=${FABRIC_INSTALLER:-}
-FABRIC_INSTALLER_URL=${FABRIC_INSTALLER_URL:-}
-FABRICVERSION=${FABRICVERSION:-LATEST}
-if [[ -z $FABRIC_INSTALLER && -z $FABRIC_INSTALLER_URL ]]; then
-  echo "Checking Fabric version information."
-  case $FABRICVERSION in
-    LATEST)
-      curl -fsSL https://maven.fabricmc.net/net/fabricmc/fabric-installer/maven-metadata.xml | xq -c . > /tmp/fabric.json
-      FABRIC_VERSION=$(< /tmp/fabric.json jq -r ".metadata.versioning.release")
-      ;;
-
-    *)
-      FABRIC_VERSION=$FABRICVERSION
-      ;;
-  esac
-
-  FABRIC_INSTALLER="/tmp/fabric-installer-$FABRIC_VERSION.jar"
-
-elif [[ -z $FABRIC_INSTALLER ]]; then
-  FABRIC_INSTALLER="/tmp/fabric-installer.jar"
-elif [[ ! -e $FABRIC_INSTALLER ]]; then
-  echo "ERROR: the given Fabric installer doesn't exist : $FABRIC_INSTALLER"
-  exit 2
-fi
-
-installMarker=".fabric-installed-${FABRIC_VERSION:-manual}"
-
-if [[ ! -e $installMarker ]]; then
-  if [[ ! -e $FABRIC_INSTALLER ]]; then
-    if [[ -z $FABRIC_INSTALLER_URL ]]; then
-      echo "Downloading $FABRIC_VERSION"
-      downloadUrl="https://maven.fabricmc.net/net/fabricmc/fabric-installer/$FABRIC_VERSION/fabric-installer-$FABRIC_VERSION.jar"
-      echo "...trying $downloadUrl"
-      curl -o $FABRIC_INSTALLER -fsSL $downloadUrl
-    else
-      echo "Downloading $FABRIC_INSTALLER_URL ..."
-      if ! curl -o $FABRIC_INSTALLER -fsSL $FABRIC_INSTALLER_URL; then
-        echo "Failed to download from given location $FABRIC_INSTALLER_URL"
-        exit 2
-      fi
-    fi
-  fi
-
-  echo "Installing Fabric $FABRIC_VERSION using $FABRIC_INSTALLER"
-  tries=3
-  set +e
-  while ((--tries >= 0)); do
-    java -jar $FABRIC_INSTALLER server -version $VANILLA_VERSION -downloadMinecraft
-    if [[ $? == 0 ]]; then
-      break
-    fi
-  done
-  set -e
-  if (($tries < 0)); then
-    echo "Fabric failed to install after several tries." >&2
-    exit 10
-  fi
-  export SERVER=fabric-server-launch.jar
-  echo "Using server $SERVER"
-  echo $SERVER > $installMarker
-
-else
-  export SERVER=$(< $installMarker)
-fi
-
-# Contineut to Final Setup
-exec /start-finalSetup01World $@

minecraft-server/start-deployForge

@@ -1,114 +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
-
-  #################################################################################
-
-  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 $@

minecraft-server/start-deployPaper

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-export SERVER=paper_server.jar
-if [ ! -f $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-    downloadUrl=${PAPER_DOWNLOAD_URL:-https://papermc.io/api/v1/paper/${VANILLA_VERSION}/latest/download}
-    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
-fi
-
-# Normalize on Spigot for operations below
-export TYPE=SPIGOT
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@

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 ] || [ -n "$FORCE_REDOWNLOAD" ]; 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 $@

minecraft-server/start-deployVanilla

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-set -o pipefail
-
-export SERVER="minecraft_server.${VANILLA_VERSION// /_}.jar"
-
-if [ ! -e $SERVER ] || [ -n "$FORCE_REDOWNLOAD" ]; then
-  echo "Downloading $SERVER ..."
-  debug "Finding version manifest for $VANILLA_VERSION"
-  versionManifestUrl=$(curl -fsSL 'https://launchermeta.mojang.com/mc/game/version_manifest.json' | jq --arg VANILLA_VERSION "$VANILLA_VERSION" --raw-output '[.versions[]|select(.id == $VANILLA_VERSION)][0].url')
-  result=$?
-  if [ $result != 0 ]; then
-    echo "ERROR failed to obtain version manifest URL ($result)"
-    exit 1
-  fi
-  if [ $versionManifestUrl = "null" ]; then
-    echo "ERROR couldn't find a matching manifest entry for $VANILLA_VERSION"
-    exit 1
-  fi
-  debug "Found version manifest at $versionManifestUrl"
-
-  serverDownloadUrl=$(curl -fsSL ${versionManifestUrl} | jq --raw-output '.downloads.server.url')
-  result=$?
-  if [ $result != 0 ]; then
-    echo "ERROR failed to obtain version manifest from $versionManifestUrl ($result)"
-    exit 1
-  fi
-
-  debug "Downloading server from $serverDownloadUrl"
-  if isDebugging; then
-    verbose=-v
-  fi
-  curl $verbose -fsSL -o $SERVER $serverDownloadUrl
-  result=$?
-  if [ $result != 0 ]; then
-    echo "ERROR failed to download server from $serverDownloadUrl ($result)"
-    exit 1
-  fi
-fi
-
-# Continue to Final Setup
-exec /start-finalSetup01World $@

minecraft-server/start-finalSetup01World

@@ -1,50 +0,0 @@
-#!/bin/bash
-
-if [ $TYPE = "FEED-THE-BEAST" ]; then
-  worldDest=$FTB_BASE_DIR/$LEVEL
-else
-  worldDest=/data/$LEVEL
-fi
-
-# If no world exists and a URL for a world is supplied, download it and unpack
-if [[ "$WORLD" ]] && [ ! -d "$worldDest" ]; 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 $@

minecraft-server/start-finalSetup02Modpack

@@ -1,108 +0,0 @@
-#!/bin/bash
-
-#  CURSE_URL_BASE used in manifest downloads below
-CURSE_URL_BASE=${CURSE_URL_BASE:-https://minecraft.curseforge.com/projects}
-
-# Remove old mods/plugins
-if [ "$REMOVE_OLD_MODS" = "TRUE" ]; then
-  if [ "$TYPE" = "SPIGOT" ]; then
-    rm -rf /data/plugins/*
-  else
-    rm -rf /data/mods/*
-  fi
-fi
-
-# If supplied with a URL for a modpack (simple zip of jars), download it and unpack
-if [[ "$MODPACK" ]]; then
-EFFECTIVE_MODPACK_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MODPACK)
-case "X$EFFECTIVE_MODPACK_URL" in
-  X[Hh][Tt][Tt][Pp]*.zip)
-    echo "Downloading mod/plugin pack via HTTP"
-    echo "  from $EFFECTIVE_MODPACK_URL ..."
-    if ! curl -sSL -o /tmp/modpack.zip "$EFFECTIVE_MODPACK_URL"; then
-      echo "ERROR: failed to download from $EFFECTIVE_MODPACK_URL"
-      exit 2
-    fi
-
-    if [ "$TYPE" = "SPIGOT" ]; then
-      mkdir -p /data/plugins
-      if ! unzip -o -d /data/plugins /tmp/modpack.zip; then
-        echo "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
-      fi
-    else
-      mkdir -p /data/mods
-      if ! unzip -o -d /data/mods /tmp/modpack.zip; then
-        echo "ERROR: failed to unzip the modpack from $EFFECTIVE_MODPACK_URL"
-      fi
-    fi
-    rm -f /tmp/modpack.zip
-    ;;
-  *)
-    echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a ZIP file"
-    ;;
-esac
-fi
-
-# If supplied with a URL for a plugin download it.
-if [[ "$MODS" ]]; then
-for i in ${MODS//,/ }
-do
-  EFFECTIVE_MOD_URL=$(curl -Ls -o /dev/null -w %{url_effective} $i)
-  case "X$EFFECTIVE_MOD_URL" in
-    X[Hh][Tt][Tt][Pp]*.jar)
-      echo "Downloading mod/plugin via HTTP"
-      echo "  from $EFFECTIVE_MOD_URL ..."
-      if ! curl -sSL -o /tmp/${EFFECTIVE_MOD_URL##*/} $EFFECTIVE_MOD_URL; then
-        echo "ERROR: failed to download from $EFFECTIVE_MOD_URL to /tmp/${EFFECTIVE_MOD_URL##*/}"
-        exit 2
-      fi
-
-      if [ "$TYPE" = "SPIGOT" ]; then
-        mkdir -p /data/plugins
-        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/plugins/${EFFECTIVE_MOD_URL##*/}
-      else
-        mkdir -p /data/mods
-        mv /tmp/${EFFECTIVE_MOD_URL##*/} /data/mods/${EFFECTIVE_MOD_URL##*/}
-      fi
-      rm -f /tmp/${EFFECTIVE_MOD_URL##*/}
-      ;;
-    *)
-      echo "Invalid URL given for modpack: Must be HTTP or HTTPS and a JAR file"
-      ;;
-  esac
-done
-fi
-
-if [[ "$MANIFEST" ]]; then
-EFFECTIVE_MANIFEST_URL=$(curl -Ls -o /dev/null -w %{url_effective} $MANIFEST)
-case "X$EFFECTIVE_MANIFEST_URL" in
-  X*.json)
-    if [ -f "${EFFECTIVE_MANIFEST_URL}" ]; then
-      MOD_DIR=${FTB_BASE_DIR:-/data}/mods
-      if [ ! -d "$MOD_DIR" ]
-      then
-        echo "Creating mods dir $MOD_DIR"
-        mkdir -p "$MOD_DIR"
-      fi
-      echo "Starting manifest download..."
-      cat "${EFFECTIVE_MANIFEST_URL}" | jq -r '.files[] | (.projectID|tostring) + " " + (.fileID|tostring)'| while read -r p f
-      do
-        if [ ! -f $MOD_DIR/${p}_${f}.jar ]
-        then
-          url="${CURSE_URL_BASE}/${p}/files/${f}/download"
-          echo Downloading curseforge mod $url
-          #  Manifest usually doesn't have mod names. Using id should be fine, tho
-          curl -sSL "${url}" -o $MOD_DIR/${p}_${f}.jar
-        fi
-      done
-    else
-      echo "Could not find manifest file, unsufficient privs, or malformed path."
-    fi
-    ;;
-  *)
-    echo "Invalid manifest file for modpack. Please make sure it is a .json file."
-    ;;
-esac
-fi
-
-exec /start-finalSetup03Modconfig $@

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 $@

minecraft-server/start-finalSetup04ServerProperties

@@ -1,146 +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
-}
-
-function customizeServerProps {
-  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-name" "$SERVER_NAME"
-  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"
-  setServerProp "level-type" "${LEVEL_TYPE^^}"
-
-  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
-}
-
-# Deploy server.properties file
-if [[ ${TYPE} == "FEED-THE-BEAST" ]]; then
-  export SERVER_PROPERTIES=${FTB_DIR}/server.properties
-  echo "detected FTB, changing properties path to ${SERVER_PROPERTIES}"
-fi
-
-if [ ! -e "$SERVER_PROPERTIES" ]; then
-  echo "Creating server.properties in ${SERVER_PROPERTIES}"
-  cp /tmp/server.properties "$SERVER_PROPERTIES"
-  customizeServerProps
-elif [ -n "${OVERRIDE_SERVER_PROPERTIES}" ]; then
-    case ${OVERRIDE_SERVER_PROPERTIES^^} in
-      TRUE|1)
-        customizeServerProps
-        ;;
-      *)
-        echo "server.properties already created, skipping"
-        ;;
-    esac
-else
-  echo "server.properties already created, skipping"
-fi
-
-exec /start-finalSetup05EnvVariables $@

minecraft-server/start-finalSetup05EnvVariables

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ "$REPLACE_ENV_VARIABLES" = "TRUE" ]; then
-  echo "Replacing env variables in configs that match the prefix $ENV_VARIABLE_PREFIX..."
-  while IFS='=' read -r name value ; do
-    # check if name of env variable matches the prefix
-    # sanity check environment variables to avoid code injections
-    if [[ "$name" = $ENV_VARIABLE_PREFIX* ]] && [[ $value =~ ^[0-9a-zA-Z_:/=?.+\-]*$ ]] && [[ $name =~ ^[0-9a-zA-Z_\-]*$ ]]; then
-        echo "Replacing $name with $value ..."
-        find /data/ -type f \( -name "*.yml" -or -name "*.yaml" -or -name "*.txt" -or -name "*.cfg" -or -name "*.properties" \) -exec sed -i 's#${'"$name"'}#'"$value"'#g' {} \;
-    fi
-  done < <(env)
-fi
-
-exec /start-minecraftFinalSetup $@

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

minecraft-server/start-minecraftFinalSetup

@@ -1,129 +0,0 @@
-#!/bin/bash
-
-. /start-utils
-
-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)
-echo "Checking for JSON files."
-JSON_FILES=$(find . -maxdepth 1 -name '*.json')
-for j in $JSON_FILES; do
-  if [[ $(python -c "print open('$j').read().strip()==''") = True ]]; then
-    echo "Fixing JSON $j"
-    echo '[]' > $j
-  fi
-done
-
-
-# If any modules have been provided, copy them over
-mkdir -p /data/mods
-if [ -d /mods ]; then
-  echo "Copying any mods over..."
-  rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /mods /data
-fi
-
-[ -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
-
-mkdir -p /data/plugins
-if [ "$TYPE" = "SPIGOT" ]; then
-  if [ -d /plugins ]; then
-    echo "Copying any Bukkit plugins over..."
-    # Copy plugins over using rsync to allow deeply nested updates of plugins
-    # only updates files if the source file is newer and print updated files
-    rsync -a --out-format="update:%f:Last Modified %M" --prune-empty-dirs --update /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}}"
-
-expandedDOpts=
-if [ -n "$JVM_DD_OPTS" ]; then
-      for dopt in $JVM_DD_OPTS
-      do
-          expandedDOpts="${expandedDOpts} -D${dopt/:/=}"
-      done
-fi
-
-mcServerRunnerArgs="--stop-duration 60s"
-
-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}"
-export JAVA_PARAMETERS="-Xms${INIT_MEMORY} $expandedDOpts"
-EOF
-
-    # patch CurseForge cfg file, if present
-    if [ -f "${FTB_DIR}/settings.cfg" ]; then
-      sed -i "/MAX_RAM=.*/ c MAX_RAM=${MAX_MEMORY};" "${FTB_DIR}/settings.cfg"
-    fi
-
-    cd "${FTB_DIR}"
-    echo "Running FTB ${FTB_SERVER_START} in ${FTB_DIR} ..."
-    if isTrue ${DEBUG_EXEC}; then
-      set -x
-    fi
-    exec mc-server-runner ${mcServerRunnerArgs} "${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
-
-  echo "Starting the Minecraft server..."
-  JVM_OPTS="-Xms${INIT_MEMORY} -Xmx${MAX_MEMORY} ${JVM_OPTS}"
-  if isTrue ${DEBUG_EXEC}; then
-    set -x
-  fi
-  exec mc-server-runner ${bootstrapArgs} ${mcServerRunnerArgs} java $JVM_XX_OPTS $JVM_OPTS $expandedDOpts -jar $SERVER "$@" $EXTRA_ARGS
-fi

minecraft-server/start-utils

@@ -1,42 +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}
-}
-
-function isDebugging {
-  if [[ ${DEBUG^^} = TRUE ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function debug {
-  if isDebugging; then
-    echo "DEBUG: $*"
-  fi
-}

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 "$@"

spring-boot/Dockerfile

@@ -0,0 +1,16 @@
+FROM itzg/gvm
+
+MAINTAINER itzg
+
+RUN ["/run", "install", "springboot"]
+
+ADD run /run
+ENTRYPOINT ["/run"]
+
+VOLUME ["/home/spring"]
+ADD app.groovy /home/spring/app.groovy
+EXPOSE 8080
+
+WORKDIR /home/spring
+
+CMD ["run", "app.groovy"]

spring-boot/app.groovy

@@ -0,0 +1,9 @@
+@RestController
+class ThisWillActuallyRun {
+
+    @RequestMapping("/")
+    String home() {
+        "Hello World!"
+    }
+
+}

spring-boot/run

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+. /.gvm/bin/gvm-init.sh
+
+spring $*

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

titandb/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7
 
-LABEL maintainer "itzg"
+MAINTAINER itzg
 
 ENV APT_GET_UPDATE 2014-07-19
 

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