From d9ac8df3d59149184ed87cc0524e29166f8338a7 Mon Sep 17 00:00:00 2001
From: Lennart Weller <lhw@ring0.de>
Date: Tue, 29 Sep 2015 15:05:26 +0200
Subject: [PATCH] smaller base image and some extra stuff around it

---
 Dockerfile         | 13 ++++---------
 docker-compose.yml | 20 ++++++++++++++++++++
 run.sh             |  7 ++++---
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
index b18cb1e..26e83c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM debian:8
 
 MAINTAINER TuRzAm
 
@@ -30,7 +30,7 @@ ENV STEAMPORT 7778
 
 # Install dependencies 
 RUN apt-get update &&\ 
-    apt-get install -y curl lib32gcc1 lsof git 
+    apt-get install -y curl lib32gcc1 lsof git sudo
 
 
 # Run commands as the steam user
@@ -40,6 +40,8 @@ RUN adduser \
 	--gecos "" \ 
 	steam
 
+RUN adduser steam sudo
+
 # Copy & rights to folders
 COPY run.sh /home/steam/run.sh
 COPY arkmanager-user.cfg /home/steam/arkmanager.cfg
@@ -57,14 +59,9 @@ RUN ./install.sh steam
 
 # Define default config file in /ark
 COPY arkmanager-system.cfg /etc/arkmanager/arkmanager.cfg
-
-
 RUN chown steam -R /ark && chmod 755 -R /ark
 
-
-
 USER steam 
-
 # download steamcmd
 RUN mkdir /home/steam/steamcmd &&\ 
 	cd /home/steam/steamcmd &&\ 
@@ -74,8 +71,6 @@ RUN mkdir /home/steam/steamcmd &&\
 # First run is on anonymous to download the app
 RUN /home/steam/steamcmd/steamcmd.sh +login anonymous +quit
 
-
-
 EXPOSE ${STEAMPORT} 32330 ${SERVERPORT}
 
 VOLUME  /ark 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..e8569a4
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,20 @@
+ark:
+  image: turzam/ark
+  environment:
+    SESSIONNAME: Ark Docker
+    SERVERMAP: TheIsland
+    SERVERPASSWORD: 
+    ADMINPASSWORD: adminpassword
+    AUTOUPDATE: 60
+    WARNMINUTE: 30
+    BACKUPONSTART: 1
+    UPDATEONSTART: 1
+    UPGRADEONSTART: 0
+  volumes:
+    - /srv/ark:/ark
+  ports:
+   - 7778:7778/udp
+   - 7778:7778
+   - 27015:27015/udp
+   - 27015:27015
+   - 32330:32330
diff --git a/run.sh b/run.sh
index f88cec5..7191e49 100644
--- a/run.sh
+++ b/run.sh
@@ -12,9 +12,10 @@ export TERM=linux
 [ ! -d /ark/backup ] && mkdir /ark/backup
 
 
-echo "Upgrade Ark server tools..."
-arkmanager upgrade
-
+if [ $UPGRADEONSTART -eq 1 ]; then
+	echo "Upgrade Ark server tools..."
+	arkmanager upgrade
+fi
 
 if [ ! -d "/ark/server" ];then 
 	echo "Install ark..."