From 7d8429ef0a5f6a217cc0879518ae4d2adc2c591f Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 8 Sep 2014 02:32:55 +0000
Subject: [PATCH] Allowing for pre-existing eula.txt Adding memory settings
 info to README

---
 minecraft-server/Dockerfile |  3 ---
 minecraft-server/README.md  | 11 ++++++++---
 minecraft-server/start.sh   | 27 +++++++++++++++------------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index a939ca95..64b2ec09 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -2,9 +2,6 @@ FROM itzg/ubuntu-openjdk-7
 
 MAINTAINER itzg
 
-ENV APT_UPDATED 2014-09-07
-
-RUN apt-get update
 RUN apt-get install -y wget libmozjs-24-bin
 RUN update-alternatives --install /usr/bin/js js /usr/bin/js24 100
 
diff --git a/minecraft-server/README.md b/minecraft-server/README.md
index cf1bcb56..d65bfd27 100644
--- a/minecraft-server/README.md
+++ b/minecraft-server/README.md
@@ -26,12 +26,17 @@ To use a different Minecraft version, pass the `VERSION` environment variable, w
                                                                      
 For example, to use the latest snapshot:                             
                                                                      
-    docker run -d -e VERSION=SNAPSHOT -p 25565:25565 itzg/minecraft-server
+    docker run -d -e VERSION=SNAPSHOT ...
                                                                   
 or a specific version:                                                                                                       
                                                                                                                              
-    docker run -d -e VERSION=1.7.9 -p 25565:25565 itzg/minecraft-server                                                           
+    docker run -d -e VERSION=1.7.9 ...
                                                                                                                              
 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' -p 25565:25565 itzg/minecraft-server
+    docker run -d -e 'MOTD=My Server' ...
+
+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):
+
+    docker run -e 'JVM_OPTS=-Xmx1024M -Xms1024M' ...
diff --git a/minecraft-server/start.sh b/minecraft-server/start.sh
index e359a4de..1fe0f20b 100755
--- a/minecraft-server/start.sh
+++ b/minecraft-server/start.sh
@@ -13,7 +13,8 @@ esac
 cd /data
 
 if [ ! -e minecraft_server.$VERSION.jar ]; then
-  wget https://s3.amazonaws.com/Minecraft.Download/versions/$VERSION/minecraft_server.$VERSION.jar
+  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
@@ -23,17 +24,19 @@ fi
 sed -i "/motd\s*=/ c motd=$MOTD" /data/server.properties
 sed -i "/level-name\s*=/ c level-name=$LEVEL" /data/server.properties
 
-if [ "$EULA" != "" -a ! -e /data/eula.txt ]; 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
+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
 
 java $JVM_OPTS -jar minecraft_server.$VERSION.jar