From 0db3c3fddc542c2dc52954e86444e43f526215fe Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Thu, 23 Jun 2016 11:02:43 +0200
Subject: [PATCH] Updated to Terraria 1.3.1.1

---
 Dockerfile | 12 +++++++-----
 start.sh   |  5 ++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b9e8cc1..1cdc8f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,20 @@
 FROM ubuntu
 
-ENV TERRARIA_VERISON=1308
+ENV TERRARIA_VERISON=1311
 
 RUN apt-get update \
- && apt-get install -y wget bash \
- && adduser gameserver
+ && apt-get install -y bash curl unzip \
+ && adduser gameserver \
+ && mkdir /data && chown gameserver: /data
 
 USER gameserver
 ENV HOME /home/gameserver
 ENV SERVER $HOME/terraria
 
 RUN mkdir -p ${SERVER} \
- && wget -O - http://terraria.org/server/terraria-server-linux-${TERRARIA_VERISON}.tar.gz | tar -C ${SERVER} -xvz \
- && ln -s ${SERVER}/terraria-server-linux-* ${SERVER}/server
+ && curl -sSLo /tmp/terraria.zip http://terraria.org/server/terraria-server-${TERRARIA_VERISON}.zip \
+ && unzip -d ${SERVER} /tmp/terraria.zip \
+ && ln -s ${SERVER}/terraria-server-* ${SERVER}/server
 
 ADD config.ini ${SERVER}/config.ini.default
 ADD start.sh ${SERVER}/start.sh
diff --git a/start.sh b/start.sh
index 98c942b..d88a2f0 100755
--- a/start.sh
+++ b/start.sh
@@ -4,5 +4,8 @@ if ! [ -e /data/config.ini ]; then
   cp ${SERVER}/config.ini.default /data/config.ini
 fi
 
-exec tail -f /dev/null | ${SERVER}/server/TerrariaServer.bin.x86_64 \
+# FIX: The ZIP archive does not have correct permissions
+chmod +x /home/gameserver/terraria/Dedicated\ Server/Linux/TerrariaServer*
+
+exec tail -f /dev/null | ${SERVER}/Dedicated\ Server/Linux/TerrariaServer.bin.x86_64 \
   -config /data/config.ini