From afa25e582d73c41b6ee05ed62a4e653180ae5e0a Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 20 Feb 2016 18:05:41 -0600
Subject: [PATCH 1/2] [mc] Upgrade base image to java:8

---
 minecraft-server/Dockerfile |  6 +++---
 minecraft-server/start.sh   | 15 ---------------
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100755 minecraft-server/start.sh

diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index 1ad07ab6..3a5ba57a 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM itzg/ubuntu-openjdk-7
+FROM java:8
 
 MAINTAINER itzg
 
@@ -19,7 +19,6 @@ RUN useradd -M -s /bin/false --uid 1000 minecraft \
 
 EXPOSE 25565
 
-COPY start.sh /start
 COPY start-minecraft.sh /start-minecraft
 
 VOLUME ["/data"]
@@ -29,7 +28,8 @@ VOLUME ["/plugins"]
 COPY server.properties /tmp/server.properties
 WORKDIR /data
 
-CMD [ "/start" ]
+USER minecraft
+CMD [ "/start-minecraft" ]
 
 # Special marker ENV used by MCCY management tool
 ENV MC_IMAGE=YES
diff --git a/minecraft-server/start.sh b/minecraft-server/start.sh
deleted file mode 100755
index 5f91e8fb..00000000
--- a/minecraft-server/start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-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

From 17bfedd137f167b357f75d08d872d908c7b6d0ed Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 20 Feb 2016 18:26:04 -0600
Subject: [PATCH 2/2] [cassandra] Upgrade to 2.2.5

---
 cassandra/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cassandra/Dockerfile b/cassandra/Dockerfile
index 07b3d2b8..8ecbc0e3 100755
--- a/cassandra/Dockerfile
+++ b/cassandra/Dockerfile
@@ -2,7 +2,7 @@ FROM itzg/ubuntu-openjdk-7
 
 MAINTAINER itzg
 
-ENV CASSANDRA_VERSION 2.2.4
+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 && \