From 5557f91c79f1f9d9897856969090fc1dbe461fdb Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 9 Nov 2014 16:27:05 +0000
Subject: [PATCH] Adding image download and scaling logic for enhancement #6

---
 minecraft-server/Dockerfile         |  9 ++++++---
 minecraft-server/start-minecraft.sh | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index 67afc19d..c4b56eac 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -2,23 +2,26 @@ FROM itzg/ubuntu-openjdk-7
 
 MAINTAINER itzg
 
-RUN apt-get install -y wget libmozjs-24-bin
+RUN apt-get install -y wget 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
 RUN chmod +x /usr/bin/jsawk
-RUN useradd -M -s /bin/false minecraft
+RUN useradd -M -s /bin/false minecraft \
+  && mkdir /data \
+  && chown minecraft:minecraft /data
 
 EXPOSE 25565
 
 ADD start.sh /start
 ADD start-minecraft.sh /start-minecraft
 
+USER minecraft
 VOLUME ['/data']
 ADD server.properties /tmp/server.properties
 WORKDIR /data
 
-CMD [ "/start" ]
+CMD [ "/start-minecraft" ]
 
 ENV MOTD A Minecraft Server Powered by Docker
 ENV LEVEL world
diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh
index e90fd202..cd7da0ea 100755
--- a/minecraft-server/start-minecraft.sh
+++ b/minecraft-server/start-minecraft.sh
@@ -30,6 +30,18 @@ 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
 
 if [ ! -e /data/eula.txt ]; then
   if [ "$EULA" != "" ]; then