[es] Introduce 2.2.0 series

[mc] resolved issues with downloading new server executable

.gitattributes

@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

.gitignore

@@ -1 +1,2 @@
-.idea/
+*.iml
+.idea

README.md

@@ -2,3 +2,5 @@ dockerfiles
 ===========
 
 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)

build

@@ -1,4 +1,11 @@
-pkgs="ubuntu-openjdk-7 gvm spring-boot"
+#!/bin/bash
+
+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

cassandra/Dockerfile

@@ -0,0 +1,26 @@
+FROM itzg/ubuntu-openjdk-7
+
+MAINTAINER itzg
+
+ENV CASSANDRA_VERSION 2.2.5
+
+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 -zxvf /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,27 @@
+#!/bin/bash
+
+sed -i -e 's/log4j.rootLogger=.*/log4j.rootLogger=INFO,stdout/' $CASSANDRA_HOME/conf/log4j-server.properties
+
+cassYml=$CASSANDRA_HOME/conf/cassandra.yaml
+
+privateAddr=$(hostname -i)
+
+seeds=${SEEDS:-${PUBLISH_AS:-$privateAddr}}
+
+sed -i -e "s/- seeds:.*/- seeds: \"$seeds\"/" $cassYml
+
+sed -i -e "s/listen_address:.*/listen_address: $privateAddr/" $cassYml
+sed -i -e "s/rpc_address:.*/rpc_address: $privateAddr/" $cassYml
+
+sed -i -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
+

circle.yml

@@ -0,0 +1,11 @@
+machine:
+  services:
+    - docker
+    
+test:
+  override:
+    - ./build
+    
+notify:
+  webhooks:
+    - url: https://webhooks.gitter.im/e/4726bb683d8aed018486

devbox/Dockerfile

@@ -1,12 +1,12 @@
 FROM itzg/ubuntu-openjdk-7
 
 RUN apt-get update
-RUN apt-get install -yq git curl wget unzip openjdk-7-jdk
+RUN DEBIAN_FRONTEND=noninteractive \
+  apt-get install -yq git curl wget unzip openjdk-7-jdk && \
+  apt-get clean
 
-ENV MAVEN_VER 3.2.2
-ENV NODEJS_VER 0.10.29
-
-WORKDIR /opt
+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
@@ -17,13 +17,14 @@ RUN curl -s https://raw.githubusercontent.com/isaacs/nave/master/nave.sh > /usr/
 RUN chmod +x /usr/local/bin/nave
 RUN nave usemain latest
 
-WORKDIR /root
-env HOME /root
+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
 
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
+WORKDIR /home/developer
 CMD bash

elasticsearch/Dockerfile

@@ -1,11 +1,10 @@
-FROM itzg/ubuntu-openjdk-7
+FROM java:openjdk-8u111-jdk
 
 MAINTAINER itzg
-RUN apt-get install -y wget && apt-get clean
 
-ENV ES_VERSION 1.4.1
+ENV ES_VERSION 2.2.0
 
-RUN wget -qO /tmp/es.tgz https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ES_VERSION.tar.gz && \
+RUN wget -qO /tmp/es.tgz https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$ES_VERSION/elasticsearch-$ES_VERSION.tar.gz && \
   cd /usr/share && \
   tar xf /tmp/es.tgz && \
   rm /tmp/es.tgz
@@ -24,4 +23,6 @@ USER elasticsearch
 
 EXPOSE 9200 9300
 
+ENV OPTS=-Dnetwork.host=_non_loopback_
+
 CMD ["/start"]

elasticsearch/README.md

@@ -31,21 +31,16 @@ http://DOCKERHOST:9200/
 Where `DOCKERHOST` would be the actual hostname of your host running
 Docker.
 
-# Basic multi-node cluster
+# Simple, multi-node cluster
 
-Running a multi-node cluster (3-node in this example) is almost as easy:
+To run a multi-node cluster (3-node in this example) on a single Docker machine use:
 
-    docker run -d -p 9200:9200 -p 9300:9300 itzg/elasticsearch
-    docker run -d -p 9201:9200 -p 9301:9300 itzg/elasticsearch
-    docker run -d -p 9202:9200 -p 9302:9300 itzg/elasticsearch
+    docker run -d --name es0 -p 9200:9200                    es
+    docker run -d --name es1 --link es0 -e UNICAST_HOSTS=es0 es
+    docker run -d --name es2 --link es0 -e UNICAST_HOSTS=es0 es
 
-where the only difference was the host port binding of `9200:`/`9300:`,
-`9201:`/`9301:`, and `9202:`/`9302:`. By default, Elasticsearch uses
-[Zen Discovery](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-discovery-zen.html), so the three nodes find each other and form a cluster. You
-can confirm that by checking the cluster health for the presence of
-three nodes (`number_of_nodes`):
 
-http://DOCKERHOST:9200/_cluster/health?pretty
+and then check the cluster health, such as http://192.168.99.100:9200/_cluster/health?pretty
 
     {
       "cluster_name" : "elasticsearch",
@@ -67,6 +62,29 @@ 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

elasticsearch/start

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ -f /conf/env ]; then
+  . /conf/env
+fi
+
 if [ ! -e /conf/elasticsearch.* ]; then
   cp $ES_HOME/config/elasticsearch.yml /conf
 fi
@@ -8,7 +12,7 @@ if [ ! -e /conf/logging.* ]; then
   cp $ES_HOME/config/logging.yml /conf
 fi
 
-OPTS="-Des.path.conf=/conf \
+OPTS="$OPTS -Des.path.conf=/conf \
   -Des.path.data=/data \
   -Des.path.logs=/data \
   -Des.transport.tcp.port=9300 \
@@ -16,12 +20,22 @@ OPTS="-Des.path.conf=/conf \
 
 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
@@ -35,7 +49,7 @@ if [ -n "$PLUGINS" ]; then
   for p in $(echo $PLUGINS | awk -v RS=, '{print}')
   do
     echo "Installing the plugin $p"
-    $ES_HOME/bin/plugin --install $p
+    $ES_HOME/bin/plugin install $p
   done
 fi
 

jenkins/Dockerfile

@@ -0,0 +1,11 @@
+FROM java:openjdk-8u72-jdk
+
+MAINTAINER itzg
+
+ADD download-and-start.sh /download-and-start
+
+ENV JENKINS_HOME /data
+VOLUME ["/data"]
+EXPOSE 8080 38252
+
+CMD ["/download-and-start"]

jenkins/README.md

@@ -0,0 +1,49 @@
+A self-upgrading [Jenkins CI](http://jenkins-ci.org/) server
+
+# Basic Usage
+
+To start Jenkins with the latest version:
+
+    ID=$(docker run -d -p 8080:8080 itzg/jenkins)
+
+At a later time, you can upgrade by restarting the container:
+
+    docker stop $ID
+    docker start $ID
+
+# Attaching host directory to Jenkins home directory
+
+The Jenkins home directory is attachable at `/data`, so attaching to a host volume
+would be:
+
+    ID=$(docker run -d -p 8080:8080 -v /SOME_HOST_DIR:/data itzg/jenkins
+
+# Entering the container to perform manual config
+
+As with any Docker container, you can run a shell within the running container:
+
+    docker exec -it $ID bash
+
+A more realistic example is installing git, openjdk-7-jdk, etc:
+
+    docker exec $ID apt-get update
+    docker exec $ID apt-get install -y git openjdk-7-jdk
+
+and then Configure the JDK in Jenkins:
+
+![](http://i.imgur.com/HVetwKc.png)
+
+# Enabling Jenkins slave agents
+
+By default, Jenkins will pick a random port to allow slave nodes launched
+by JNLP. Since Docker networking is basically a firewall, a random port
+won't work for us. Instead the fixed port **38252** was chosen (arbitrarily)
+to be exposed by the container.
+
+Launch your Jenkins container using
+
+    ID=$(docker run -d -p 8080:8080 -p 38252:38252 itzg/jenkins)
+
+and configure the port in the Global Security settings:
+
+![](http://i.imgur.com/PhQiEHy.png)

jenkins/download-and-start.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+mirrorUrl=http://mirrors.jenkins-ci.org/war/latest/jenkins.war
+url=$(curl -s --head $mirrorUrl|awk -F': ' '$1 == "Location" { print $2 }' | sed 's/[[:space:]]*$//')
+version=$(echo $url | sed 's#.*/war/\(.*\)/jenkins.war#\1#')
+
+mkdir -p /opt/jenkins
+trackingFile=/opt/jenkins/INSTALLED
+
+installed=
+if [ -f $trackingFile ]; then
+  installed=$(cat $trackingFile)
+  echo "Version installed is $installed"
+fi
+
+if [ $version != "$installed" ]; then
+  echo "Downloading $version from '$url'"
+  while ! curl -s -o /opt/jenkins/jenkins.war "$url"
+  do
+    echo "Trying again in 5 seconds"
+    sleep 5
+  done
+
+  echo $version > $trackingFile
+fi
+
+
+cd /opt/jenkins
+exec java -jar jenkins.war

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/.dockerignore

@@ -0,0 +1 @@
+data

minecraft-server/Dockerfile

@@ -1,29 +1,48 @@
-FROM itzg/ubuntu-openjdk-7
+FROM java:8
 
 MAINTAINER itzg
 
-RUN apt-get install -y wget libmozjs-24-bin imagemagick && apt-get clean
+ENV APT_GET_UPDATE 2015-10-03
+RUN apt-get update
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
+  libmozjs-24-bin \
+  imagemagick \
+  lsof \
+  nano \
+  sudo \
+  vim \
+  && apt-get clean
 RUN update-alternatives --install /usr/bin/js js /usr/bin/js24 100
 
 RUN wget -O /usr/bin/jsawk https://github.com/micha/jsawk/raw/master/jsawk
 RUN chmod +x /usr/bin/jsawk
-RUN useradd -M -s /bin/false minecraft \
+RUN useradd -M -s /bin/false --uid 1000 minecraft \
   && mkdir /data \
-  && chown minecraft:minecraft /data
+  && mkdir /config \
+  && mkdir /mods \
+  && mkdir /plugins \
+  && chown minecraft:minecraft /data /config /mods /plugins
 
 EXPOSE 25565
 
-ADD start.sh /start
-ADD start-minecraft.sh /start-minecraft
+COPY start.sh /start
+COPY start-minecraft.sh /start-minecraft
 
-USER minecraft
-VOLUME ['/data']
-ADD server.properties /tmp/server.properties
+VOLUME ["/data"]
+VOLUME ["/mods"]
+VOLUME ["/config"]
+VOLUME ["/plugins"]
+COPY server.properties /tmp/server.properties
 WORKDIR /data
 
-CMD [ "/start-minecraft" ]
+CMD [ "/start" ]
 
+# Special marker ENV used by MCCY management tool
+ENV MC_IMAGE=YES
+
+ENV UID=1000 GID=1000
 ENV MOTD A Minecraft Server Powered by Docker
-ENV LEVEL world
 ENV JVM_OPTS -Xmx1024M -Xms1024M
-ENV VERSION 1.8.1
+ENV TYPE=VANILLA VERSION=LATEST FORGEVERSION=RECOMMENDED LEVEL=world PVP=true DIFFICULTY=easy \
+  LEVEL_TYPE=DEFAULT GENERATOR_SETTINGS= WORLD= MODPACK=

minecraft-server/README.md

@@ -1,12 +1,19 @@
-This docker image provides a Minecraft Server that will automatically download the latest stable,
-latest snapshot, or any specific version.
+
+[![Docker Pulls](https://img.shields.io/docker/pulls/itzg/minecraft-server.svg)](https://hub.docker.com/r/itzg/minecraft-server/)
+
+
+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
+latest snapshot. See the *Versions* section below for more information.
 
 To simply use the latest stable version, run
 
-    docker run -d -p 25565:25565 itzg/minecraft-server
+    docker run -d -p 25565:25565 --name mc itzg/minecraft-server
 
-where the default server port, 25565, will be exposed on your host machine. If you want to serve up multiple
-Minecraft servers or just use an alternate port, change the host-side port mapping such as
+where the standard server port, 25565, will be exposed on your host machine.
+
+If you want to serve up multiple Minecraft servers or just use an alternate port,
+change the host-side port mapping such as
 
     docker run -p 25566:25565 ...
 
@@ -15,16 +22,35 @@ will serve your Minecraft server on your host's port 25566 since the `-p` syntax
 
 Speaking of multiple servers, it's handy to give your containers explicit names using `--name`, such as
 
-    docker run -d -p 25565:25565 --name minecraft-default itzg/minecraft-server
+    docker run -d -p 25565:25565 --name mc itzg/minecraft-server
 
 With that you can easily view the logs, stop, or re-start the container:
 
-    docker logs -f minecraft-default
+    docker logs -f mc
         ( Ctrl-C to exit logs action )
 
-    docker stop minecraft-default
+    docker stop mc
 
-    docker start minecraft-default
+    docker start mc
+
+## Interacting with the server
+
+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
+
+With that you can attach and interact at any time using
+
+    docker attach mc
+
+and then Control-p Control-q to **detach**.
+
+For remote access, configure your Docker daemon to use a `tcp` socket (such as `-H tcp://0.0.0.0:2375`)
+and attach from another machine:
+
+    docker -H $HOST:2375 attach mc
+
+Unless you're on a home/private LAN, you should [enable TLS access](https://docs.docker.com/articles/https/).
 
 ## EULA Support
 
@@ -34,16 +60,28 @@ Mojang now requires accepting the [Minecraft EULA](https://account.mojang.com/do
 
 such as
 
-        docker run -e EULA=TRUE -d -p 25565:25565 itzg/minecraft-server
+        docker run -d -it -e EULA=TRUE -p 25565:25565 --name mc itzg/minecraft-server
 
 ## Attaching data directory to host filesystem
 
-In order to persist the Minecraft data, which you *probably want to do for a real server setup*, use the `-v` argument
+In order to readily access the Minecraft data, use the `-v` argument
 to map a directory on your host machine to the container's `/data` directory, such as:
 
     docker run -d -v /path/on/host:/data ...
 
-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.
+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
 
@@ -61,8 +99,234 @@ or a specific version:
 
     docker run -d -e VERSION=1.7.9 ...
 
+## Running a Forge Server
+
+Enable Forge server mode by adding a `-e TYPE=FORGE` to your command-line.
+By default the container will run the `RECOMMENDED` version of [Forge server](http://www.minecraftforge.net/wiki/)
+but you can also choose to run a specific version with `-e FORGEVERSION=10.13.4.1448`.
+
+    $ docker run -d -v /path/on/host:/data -e VERSION=1.7.10 \
+        -e TYPE=FORGE -e FORGEVERSION=10.13.4.1448 \
+        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+
+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 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.
+
+The VERSION option should be set to 1.8, as this is the only version of CraftBukkit and Spigot currently
+available.  The latest build in this branch will be used.
+
+    $ docker run -d -v /path/on/host:/data \
+        -e TYPE=SPIGOT -e VERSION=1.8 \
+        -p 25565:25565 -e EULA=TRUE --name mc itzg/minecraft-server
+
+You can install Bukkit plugins in two ways.
+
+### 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 plugins to the `/path/on/host/plugins` folder you chose. From the example above,
+the `/path/on/host` folder contents look like:
+
+```
+/path/on/host
+├── plugins
+│   └── ... INSTALL PLUGINS HERE ...
+├── ops.json
+├── server.properties
+├── whitelist.json
+└── ...
+```
+
+If you add plugins 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 is one additional volume that can be mounted; `/plugins`.  
+Any files in this filesystem will be copied over to the main
+`/data/plugins` filesystem before starting Minecraft.
+
+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.
+
+## Using Docker Compose
+
+Rather than type the server options below, the port mappings above, etc
+every time you want to create new Minecraft server, you can now use
+[Docker Compose](https://docs.docker.com/compose/). Start with a
+`docker-compose.yml` file like the following:
+
+```
+minecraft-server:
+  ports:
+    - "25565:25565"
+
+  environment:
+    EULA: TRUE
+
+  image: itzg/minecraft-server
+
+  container_name: mc
+
+  tty: true
+  stdin_open: true
+  restart: always
+```
+
+and in the same directory as that file run
+
+    docker-compose -d up
+
+Now, go play...or adjust the  `environment` section to configure
+this server instance.    
+
 ## Server configuration
 
+### Difficulty
+
+The difficulty level (default: `easy`) can be set like:
+
+    docker run -d -e DIFFICULTY=hard ...
+
+Valid values are: `peaceful`, `easy`, `normal`, and `hard`, and an
+error message will be output in the logs if it's not one of these
+values.
+
+### Whitelist Players
+
+To whitelist players for your Minecraft server, pass the Minecraft usernames separated by commas via the `WHITELIST` environment variable, such as
+
+	docker run -d -e WHITELIST=user1,user2 ...
+
+If the `WHITELIST` environment variable is not used, any user can join your Minecraft server if it's publicly accessible.
+
+### Op/Administrator Players
+
+To add more "op" (aka adminstrator) users to your Minecraft server, pass the Minecraft usernames separated by commas via the `OPS` environment variable, such as
+
+	docker run -d -e OPS=user1,user2 ...
+
+### Server icon
+
+A server icon can be configured using the `ICON` variable. The image will be automatically
+downloaded, scaled, and converted from any other image format:
+
+    docker run -d -e ICON=http://..../some/image.png ...
+
+### Level Seed
+
+If you want to create the Minecraft level with a specific seed, use `SEED`, such as
+
+    docker run -d -e SEED=1785852800490497919 ...
+
+### Game Mode
+
+By default, Minecraft servers are configured to run in Survival mode. You can
+change the mode using `MODE` where you can either provide the [standard
+numerical values](http://minecraft.gamepedia.com/Game_mode#Game_modes) or the
+shortcut values:
+
+* creative
+* survival
+* adventure
+* spectator (only for Minecraft 1.8 or later)
+
+For example:
+
+    docker run -d -e MODE=creative ...
+
+### Message of the Day
+
+The message of the day, shown below each server entry in the UI, can be changed with the `MOTD` environment variable, such as
+
+    docker run -d -e 'MOTD=My Server' ...
+
+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
+
+By default, servers are created with player-vs-player (PVP) mode enabled. You can disable this with the `PVP`
+environment variable set to `false`, such as
+
+    docker run -d -e PVP=false ...
+
+### 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
+
+* DEFAULT
+* FLAT
+* LARGEBIOMES
+* AMPLIFIED
+* CUSTOMIZED
+
+Descriptions are available at the [gamepedia](http://minecraft.gamepedia.com/Server.properties).
+
+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.**
+
+For example (just the `-e` bits):
+
+    -e LEVEL_TYPE=flat -e 'GENERATOR_SETTINGS=3;minecraft:bedrock,3*minecraft:stone,52*minecraft:sandstone;2;'
+
+### World Save Name
+
 You can either switch between world saves or run multiple containers with different saves by using the `LEVEL` option,
 where the default is "world":
 
@@ -71,22 +335,44 @@ where the default is "world":
 **NOTE:** if running multiple containers be sure to either specify a different `-v` host directory for each
 `LEVEL` in use or don't use `-v` and the container's filesystem will keep things encapsulated.
 
-The message of the day, shown below each server entry in the UI, can be changed with the `MOTD` environment variable, such as
+### Downloadable world
 
-    docker run -d -e 'MOTD=My Server' ...
+Instead of mounting the `/data` volume, you can instead specify the URL of
+a ZIP file containing an archived world.  This will be downloaded, and
+unpacked in the `/data` directory; if it does not contain a subdirectory
+called `world/` then it will be searched for a file `level.dat` and the 
+containing subdirectory renamed to `world`.  This means that most of the
+archived Minecraft worlds downloadable from the Internet will already be in
+the correct format.
 
-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._
+The ZIP file may also contain a `server.properties` file and `modules`
+directory, if required.
 
-To add more "op" (aka adminstrator) users to your Minecraft server, pass the Minecraft usernames separated by commas via the `OPS` environment variable, such as
+    docker run -d -e WORLD=http://www.example.com/worlds/MySave.zip ...
 
-	docker run -d -e OPS=user1,user2 ...
+**NOTE:** Unless you also mount `/data` as an external volume, this world
+will be deleted when the container is deleted.
 
-A server icon can be configured using the `ICON` variable. The image will be automatically
-downloaded, scaled, and converted from any other image format:
+**NOTE:** This URL must be accessible from inside the container.  Therefore,
+you should use an IP address or a globally resolveable FQDN, or else the
+name of a linked container.
+
+### Downloadable mod/plugin pack for Forge, Bukkit, and Spigot Servers
+
+Like the `WORLD` option above, you can specify the URL of a "mod pack"
+to download and install into `mods` for Forge or `plugins` for Bukkit/Spigot. 
+To use this option pass the environment variable `MODPACK`, such as
+
+    docker run -d -e MODPACK=http://www.example.com/mods/modpack.zip ...
+
+**NOTE:** The referenced URL must be a zip file with one or more jar files at the
+top level of the zip archive. Make sure the jars are compatible with the
+particular `TYPE` of server you are running.
+
+## JVM Configuration
+
+### Memory Limit
 
-    docker run -d -e ICON=http://..../some/image.png
-                                                                                                     
 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):
 

minecraft-server/docker-compose.yml

@@ -0,0 +1,14 @@
+minecraft-server:
+  ports:
+    - "25565:25565"
+
+  environment:
+    EULA: TRUE
+
+  image: itzg/minecraft-server
+
+  container_name: minecraft-server
+
+  tty: true
+  stdin_open: true
+  restart: always

minecraft-server/server.properties

@@ -21,7 +21,7 @@ online-mode=true
 resource-pack=
 pvp=true
 difficulty=1
-enable-command-block=false
+enable-command-block=true
 player-idle-timeout=0
 gamemode=0
 max-players=20
@@ -30,4 +30,4 @@ generate-structures=true
 view-distance=10
 spawn-protection=16
 motd=A Minecraft Server powered by Docker
-
+generator-settings=

minecraft-server/start-minecraft.sh

@@ -1,47 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-case $VERSION in
-  LATEST)
-    export VERSION=`wget -O - https://s3.amazonaws.com/Minecraft.Download/versions/versions.json | jsawk -n 'out(this.latest.release)'`
-    ;;
-
-  SNAPSHOT)
-    export VERSION=`wget -O - https://s3.amazonaws.com/Minecraft.Download/versions/versions.json | jsawk -n 'out(this.latest.snapshot)'`
-    ;;
-esac
-
-cd /data
-
-if [ ! -e minecraft_server.$VERSION.jar ]; then
-  echo "Downloading minecraft_server.$VERSION.jar ..."
-  wget -q https://s3.amazonaws.com/Minecraft.Download/versions/$VERSION/minecraft_server.$VERSION.jar
-fi
-
-if [ ! -e server.properties ]; then
-  cp /tmp/server.properties .
-fi
-
-if [ -n "$MOTD" ]; then
-  sed -i "/motd\s*=/ c motd=$MOTD" /data/server.properties
-fi
-if [ -n "$LEVEL" ]; then
-  sed -i "/level-name\s*=/ c level-name=$LEVEL" /data/server.properties
-fi
-if [ -n "$OPS" ]; then
-  echo $OPS | awk -v RS=, '{print}' >> ops.txt
-fi
-if [ -n "$ICON" ]; 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
+umask 002
 
 if [ ! -e /data/eula.txt ]; then
   if [ "$EULA" != "" ]; then
@@ -58,4 +17,318 @@ if [ ! -e /data/eula.txt ]; then
   fi
 fi
 
-java $JVM_OPTS -jar minecraft_server.$VERSION.jar
+echo "Checking version information."
+case "X$VERSION" in
+  X|XLATEST|Xlatest)
+    VANILLA_VERSION=`wget -O - https://s3.amazonaws.com/Minecraft.Download/versions/versions.json | jsawk -n 'out(this.latest.release)'`
+  ;;
+  XSNAPSHOT|Xsnapshot)
+    VANILLA_VERSION=`wget -O - https://s3.amazonaws.com/Minecraft.Download/versions/versions.json | jsawk -n 'out(this.latest.snapshot)'`
+  ;;
+  X[1-9]*)
+    VANILLA_VERSION=$VERSION
+  ;;
+  *)
+    VANILLA_VERSION=`wget -O - https://s3.amazonaws.com/Minecraft.Download/versions/versions.json | jsawk -n 'out(this.latest.release)'`
+  ;;
+esac
+
+cd /data
+
+echo "Checking type information."
+case "$TYPE" in
+  *BUKKIT|*bukkit|SPIGOT|spigot)
+    TYPE=SPIGOT
+    case "$TYPE" in
+      *BUKKIT|*bukkit)
+        echo "Downloading latest CraftBukkit $VANILLA_VERSION server ..."
+        SERVER=craftbukkit_server.jar
+        ;;
+      *)
+        echo "Downloading latest Spigot $VANILLA_VERSION server ..."
+        SERVER=spigot_server.jar
+        ;;
+    esac
+    case $VANILLA_VERSION in
+      1.8*)
+        URL=/spigot18/$SERVER
+        ;;
+      1.9*)
+        URL=/spigot19/$SERVER
+        ;;
+      *)
+        echo "That version of $SERVER is not available."
+        exit 1
+      ;;
+    esac
+
+    #attempt https, and if it fails, fallback to http and download that way. Display error if neither works.
+    wget -q -N $SERVER https://getspigot.org$URL || \
+    	(echo "Falling back to http, unable to contact server using https..." && \
+    	wget -q -N $SERVER http://getspigot.org$URL) || \
+    	echo "Unable to download new copy of spigot server"
+
+    ;;
+
+  FORGE|forge)
+    TYPE=FORGE
+    norm=$VANILLA_VERSION
+
+    echo "Checking Forge version information."
+    case $FORGEVERSION in
+        RECOMMENDED)
+  		FORGE_VERSION=`wget -O - http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json | jsawk -n "out(this.promos['$norm-recommended'])"`
+        ;;
+
+        *)
+  		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
+  ;;
+
+  VANILLA|vanilla)
+    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 "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 -d /data/plugins /tmp/modpack.zip
+    else
+      mkdir -p /data/mods
+      unzip -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
+
+if [ ! -e server.properties ]; then
+  cp /tmp/server.properties .
+
+  if [ -n "$WHITELIST" ]; then
+    sed -i "/whitelist\s*=/ c whitelist=true" /data/server.properties
+    sed -i "/white-list\s*=/ c white-list=true" /data/server.properties
+  fi
+
+  if [ -n "$MOTD" ]; then
+    sed -i "/motd\s*=/ c motd=$MOTD" /data/server.properties
+  fi
+
+  if [ -n "$LEVEL" ]; then
+    sed -i "/level-name\s*=/ c level-name=$LEVEL" /data/server.properties
+  fi
+
+  if [ -n "$SEED" ]; then
+    sed -i "/level-seed\s*=/ c level-seed=$SEED" /data/server.properties
+  fi
+
+  if [ -n "$PVP" ]; then
+    sed -i "/pvp\s*=/ c pvp=$PVP" /data/server.properties
+  fi
+
+  if [ -n "$LEVEL_TYPE" ]; then
+    # normalize to uppercase
+    LEVEL_TYPE=${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 "$GENERATOR_SETTINGS" ]; then
+    sed -i "/generator-settings\s*=/ c generator-settings=$GENERATOR_SETTINGS" /data/server.properties
+  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
+    sed -i "/difficulty\s*=/ c difficulty=$DIFFICULTY" /data/server.properties
+  fi
+
+  if [ -n "$MODE" ]; then
+    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 $OPS | awk -v RS=, '{print}' >> ops.txt
+fi
+
+if [ -n "$WHITELIST" -a ! -e white-list.txt.converted ]; then
+  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
+  echo Copying any Bukkit plugins over
+  if [ -d /plugins ]; then
+    cp -r /plugins /data
+  fi
+fi
+
+# If we have a bootstrap.txt file... feed that in to the server stdin
+if [ -f /data/bootstrap.txt ];
+then
+    exec java $JVM_OPTS -jar $SERVER < /data/bootstrap.txt
+else
+    exec java $JVM_OPTS -jar $SERVER
+fi
+
+exec java $JVM_OPTS -jar $SERVER

minecraft-server/start.sh

@@ -1,4 +1,15 @@
 #!/bin/sh
+
 set -e
-chown -R minecraft:minecraft /data
-exec su -s /bin/bash -c /start-minecraft minecraft
+usermod --uid $UID minecraft
+groupmod --gid $GID minecraft
+
+chown -R minecraft:minecraft /data /start-minecraft
+chmod -R g+wX /data /start-minecraft
+
+while lsof -- /start-minecraft; do
+  echo -n "."
+  sleep 1
+done
+echo "...switching to user 'minecraft'"
+exec sudo -E -u minecraft /start-minecraft

titan-gremlin/Dockerfile

@@ -2,16 +2,15 @@ FROM itzg/ubuntu-openjdk-7
 
 MAINTAINER itzg
 
-RUN apt-get install -y wget unzip
+ENV TITAN_VERSION 0.5.4
 
-RUN wget -q -O /tmp/titan.zip http://s3.thinkaurelius.com/downloads/titan/titan-0.5.0-hadoop2.zip
-RUN unzip /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-0.5.0-hadoop2
+ENV TITAN_HOME /opt/titan-$TITAN_VERSION-hadoop2
 WORKDIR $TITAN_HOME
 
 VOLUME ["/conf","/data"]
 ADD start-gremlin.sh /opt/start-gremlin.sh
 
-CMD ["/bin/bash", "-e", "/opt/start-gremlin.sh"]
-
+CMD ["/opt/start-gremlin.sh"]

titan-gremlin/README.md

@@ -1,4 +1,6 @@
-Runs the Gremlin console from the Titan Graph Database "all" distribution.
+Runs the Gremlin console from the Titan Graph Database's "all" distribution.
+
+# Basic Usage
 
 To start the Gremlin console with the default configuration files available:
 
@@ -10,5 +12,34 @@ attach a host directory to the container's `/conf` such as
     docker run -it -v $(pwd)/conf:/conf itzg/titan-gremlin
 
 After running once your host directory will be populated with the distribution-default
-configuration files. Modify those or add to them and they will available during
-the next use of gremlin.
+configuration files. Modify those or add to them and they will be available during
+the next time you (re)start your container.
+
+# Connecting to Cassandra and Elasticsearch Containers
+
+First start containers for Cassandra and Elasticsearch, where the `--name` you choose
+can be arbitrary or left off to use a generated name.
+
+    docker run -d --name gremlin-cass itzg/cassandra 
+    docker run -d --name gremlin-es itzg/elasticsearch
+
+Now start Gremlin with networking links to those containers with the aliases
+
+* `--link <container>:cass`
+* `--link <container>:es`
+
+such as
+
+    docker run -it --rm --link gremlin-cass:cass --link gremlin-es:es itzg/titan-gremlin
+
+and with that you can follow the
+[Graph of the Gods example](http://s3.thinkaurelius.com/docs/titan/current/getting-started.html), such as
+
+    gremlin> GraphOfTheGodsFactory.load(g)
+    gremlin> saturn = g.V.has('name','saturn').next()
+    ==>v[256]
+    gremlin> saturn.map()
+    ==>name=saturn
+    ==>age=10000
+    gremlin> saturn.in('father').in('father').name
+    ==>hercules

titan-gremlin/start-gremlin.sh

@@ -1,7 +1,62 @@
 #!/bin/bash
 
+args=
+
 if [ $(ls /conf|wc -l) = 0 ]; then
   cp -r $TITAN_HOME/conf/* /conf
 fi
 
-$TITAN_HOME/bin/gremlin.sh
+rm -f /tmp/titan.properties
+
+if [ -n "$CASS_PORT_9160_TCP_ADDR" ]; then
+
+  shortcut=/tmp/titan.properties
+  cat >> /tmp/titan.properties <<END
+storage.backend=cassandra
+storage.hostname=$CASS_PORT_9160_TCP_ADDR
+END
+
+elif [ -n "$CASS_ADDR" ]; then
+
+  shortcut=/tmp/titan.properties
+  cat >> /tmp/titan.properties <<END
+storage.backend=cassandra
+storage.hostname=$CASS_ADDR
+END
+
+fi
+
+
+esAddr=${ES_ENV_PUBLISH_AS:-${ES_PORT_9300_TCP_ADDR}}
+
+if [ -n "$ES_CLUSTER" -o -n "$esAddr" ]; then
+  shortcut=/tmp/titan.properties
+  cat >> /tmp/titan.properties <<END
+index.search.backend=elasticsearch
+index.search.elasticsearch.client-only=true
+END
+
+  if [ -n "$ES_CLUSTER" ]; then
+    cat >> /tmp/titan.properties <<END
+index.search.elasticsearch.ext.cluster.name=$ES_CLUSTER
+END
+  fi
+  if [ -n "$esAddr" ]; then
+    # strip off the port spec, if present
+    esAddr=$(echo $esAddr | cut -d: -f1)
+    cat >> /tmp/titan.properties <<END
+index.search.hostname=$esAddr
+END
+  fi
+  
+fi
+
+if [ -n "$shortcut" ]; then
+  cat > /tmp/init.groovy <<END
+g = TitanFactory.open('$shortcut')
+println 'The graph \'g\' was opened using $shortcut'
+END
+  args="$args /tmp/init.groovy"
+fi
+
+exec $TITAN_HOME/bin/gremlin.sh $args

ubuntu-openjdk-7/Dockerfile

@@ -2,8 +2,10 @@ FROM ubuntu:trusty
 
 MAINTAINER itzg
 
-ENV APT_GET_UPDATE 2014-10-14
+ENV APT_GET_UPDATE 2015-10-29
 RUN apt-get update
-RUN apt-get install -y openjdk-7-jre-headless
+RUN DEBIAN_FRONTEND=noninteractive \
+  apt-get -q -y install openjdk-7-jre-headless wget unzip \
+  && apt-get clean
 
 ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64