From b1f9d1c7c66794e028df8ce6191314a49802f6ca Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Fri, 20 Mar 2015 20:26:43 -0500
Subject: [PATCH] Use Forge recommended (not latest) version * Misc Dockerfile
 cleanup ** use COPY instead of ADD ** wget is now pre-installed by base image

---
 minecraft-server/Dockerfile         | 8 ++++----
 minecraft-server/start-minecraft.sh | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index d3e19a35..e0ecea9a 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -3,7 +3,7 @@ FROM itzg/ubuntu-openjdk-7
 MAINTAINER itzg
 
 RUN apt-get update
-RUN apt-get install -y wget libmozjs-24-bin imagemagick && apt-get clean
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libmozjs-24-bin imagemagick && 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
@@ -14,11 +14,11 @@ RUN useradd -M -s /bin/false --uid 1000 minecraft \
 
 EXPOSE 25565
 
-ADD start.sh /start
-ADD start-minecraft.sh /start-minecraft
+COPY start.sh /start
+COPY start-minecraft.sh /start-minecraft
 
 VOLUME ["/data"]
-ADD server.properties /tmp/server.properties
+COPY server.properties /tmp/server.properties
 WORKDIR /data
 
 CMD [ "/start" ]
diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh
index 1c619ad8..412ef552 100755
--- a/minecraft-server/start-minecraft.sh
+++ b/minecraft-server/start-minecraft.sh
@@ -45,7 +45,6 @@ case $TYPE in
     # norm := the official Minecraft version as Forge is tracking it. dropped the third part starting with 1.8
     case $VANILLA_VERSION in
       1.7.*)
-        echo OLDER
         norm=$VANILLA_VERSION
       ;;
 
@@ -54,7 +53,7 @@ case $TYPE in
       ;;
     esac
 
-    FORGE_VERSION=`wget -O - http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json | jsawk -n "out(this.promos['$norm-latest'])"`
+    FORGE_VERSION=`wget -O - http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json | jsawk -n "out(this.promos['$norm-recommended'])"`
 
     normForgeVersion="$norm-$FORGE_VERSION"
     FORGE_INSTALLER="forge-$normForgeVersion-installer.jar"