From 262cb26608e2ed191ee1fe0b270de7995daba717 Mon Sep 17 00:00:00 2001
From: STAM <developer@epicm.org>
Date: Thu, 13 Feb 2020 17:33:44 +0300
Subject: [PATCH] 7d2d container build fix

---
 linux/7d2d/Dockerfile                     | 17 ++++++++++-------
 linux/7d2d/Makefile                       |  5 +++++
 linux/7d2d/{run_7d2d.sh => entrypoint.sh} |  2 +-
 linux/7d2d/{vol => }/serverconfig.xml     |  0
 4 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 linux/7d2d/Makefile
 rename linux/7d2d/{run_7d2d.sh => entrypoint.sh} (80%)
 rename linux/7d2d/{vol => }/serverconfig.xml (100%)

diff --git a/linux/7d2d/Dockerfile b/linux/7d2d/Dockerfile
index 61f6e06..a9b1211 100644
--- a/linux/7d2d/Dockerfile
+++ b/linux/7d2d/Dockerfile
@@ -2,16 +2,19 @@
 # 7d2d dedicated server
 ##############################################
 FROM epicmorg/linux-steamcmd
-LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
-
-WORKDIR $VALVE_GAME_FOLDER
+LABEL maintainer="Guah0s"
 
 #Install 7d2d dedicated server
-RUN steamcmd +login anonymous +force_install_dir $VALVE_GAME_FOLDER +app_update 294420 +quit && \
-    mkdir $VALVE_VOLUME_FOLDER
+RUN steamcmd +login anonymous +force_install_dir ${VALVE_GAME_FOLDER} +app_update 294420 +quit
 
 #Copy run script and set permissions
-COPY run_7d2d.sh $VALVE_GAME_FOLDER/run_7d2d.sh && chmod +x $VALVE_GAME_FOLDER/run_7d2d.sh
+COPY serverconfig.xml ${VALVE_VOLUME_FOLDER}/serverconfig.xml
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+WORKDIR ${VALVE_GAME_FOLDER}
+
+VOLUME ${VALVE_VOLUME_FOLDER}
 
 #Run the server
-ENTRYPOINT $VALVE_GAME_FOLDER/run_7d2d.sh
+ENTRYPOINT ${VALVE_GAME_FOLDER}/run_7d2d.sh
diff --git a/linux/7d2d/Makefile b/linux/7d2d/Makefile
new file mode 100644
index 0000000..6319930
--- /dev/null
+++ b/linux/7d2d/Makefile
@@ -0,0 +1,5 @@
+all: emgcmd
+emgcmd:
+	docker build --compress -t epicmorg/linux-7d2d .
+	docker push epicmorg/linux-7d2d
+
diff --git a/linux/7d2d/run_7d2d.sh b/linux/7d2d/entrypoint.sh
similarity index 80%
rename from linux/7d2d/run_7d2d.sh
rename to linux/7d2d/entrypoint.sh
index ff971ad..7a917a5 100755
--- a/linux/7d2d/run_7d2d.sh
+++ b/linux/7d2d/entrypoint.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-$VALVE_GAME_FOLDER/7DaysToDieServer.x86_64 \
+$VALVE_GAME_FOLDER/startserver.sh \
 -logfile $VALVE_VOLUME_FOLDER/7d2d_output_log__`date +%Y-%m-%d__%H-%M-%S`.txt \ 
 -quit -batchmode -nographics -dedicated -configfile=$VALVE_VOLUME_FOLDER/serverconfig.xml
diff --git a/linux/7d2d/vol/serverconfig.xml b/linux/7d2d/serverconfig.xml
similarity index 100%
rename from linux/7d2d/vol/serverconfig.xml
rename to linux/7d2d/serverconfig.xml