From c835ff62ae01ad935d6c2f96f1961e5f78f760b0 Mon Sep 17 00:00:00 2001
From: Guahos <chipmunkzombie@gmail.com>
Date: Mon, 17 Feb 2020 17:05:09 +0000
Subject: [PATCH] another fix

---
 linux/7d2d/Dockerfile           | 12 +++++++-----
 linux/7d2d/Makefile             | 14 ++++++++++----
 linux/7d2d/docker-compose.yml   |  2 +-
 linux/7d2d/vol/serverconfig.xml | 12 ++++++------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/linux/7d2d/Dockerfile b/linux/7d2d/Dockerfile
index 4252e7e..bbf8b9a 100644
--- a/linux/7d2d/Dockerfile
+++ b/linux/7d2d/Dockerfile
@@ -7,12 +7,14 @@ LABEL maintainer="Guahos, chipmunkzombie@gmail.com"
 #Steam App ID
 ARG STEAM_APP_ID=294420
 
+#Environmental variables
+ENV LD_LIBRARY_PATH ${VALVE_STEAMCMD_FOLDER}/linux64/
+
 #Vols & dirs
 WORKDIR ${VALVE_GAME_FOLDER}
 VOLUME ${VALVE_VOLUME_FOLDER}
-ENV LD_LIBRARY_PATH ${VALVE_STEAMCMD_FOLDER}/linux64/
-RUN mkdir ${VALVE_VOLUME_FOLDER}/worldsave && chmod 777 ${VALVE_VOLUME_FOLDER}/worldsave && \
-    mkdir ${VALVE_VOLUME_FOLDER}/worlddata && chmod 777 ${VALVE_VOLUME_FOLDER}/worlddata
+RUN mkdir ${VALVE_VOLUME_FOLDER}/worldsave && mkdir ${VALVE_VOLUME_FOLDER}/worlddata && \
+    chmod 777 ${VALVE_VOLUME_FOLDER}/world*
 
 #Expose ports
 EXPOSE 26900/tcp
@@ -24,9 +26,9 @@ EXPOSE 8080/tcp
 EXPOSE 8081/tcp
 
 #Install 7d2d dedicated server
-RUN steamcmd +login anonymous +force_install_dir ${VALVE_GAME_FOLDER} +app_update $STEAM_APP_ID +quit
+RUN steamcmd +login anonymous +force_install_dir ${VALVE_GAME_FOLDER} +app_update ${STEAM_APP_ID} +quit
 
-#Copy run script and set permissions
+#Copy entrypoint script and set permissions
 COPY serverconfig.xml ${VALVE_VOLUME_FOLDER}/serverconfig.xml
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
diff --git a/linux/7d2d/Makefile b/linux/7d2d/Makefile
index 6319930..eeda9ee 100644
--- a/linux/7d2d/Makefile
+++ b/linux/7d2d/Makefile
@@ -1,5 +1,11 @@
-all: emgcmd
-emgcmd:
-	docker build --compress -t epicmorg/linux-7d2d .
-	docker push epicmorg/linux-7d2d
+build: 
+	docker build --tag "7d2d_ds:latest" .
 
+run:
+	docker run -itd --name "7d2d-docker" -p 26900-26903:26900-26903/udp -p 26900:26900/tcp -p 8080-8081:8080-8081 -v 7d2dvol:/valve/volume 7d2d_ds:latest
+
+start:
+	docker start 7d2d-docker
+
+stop:
+	docker stop 7d2d-docker
diff --git a/linux/7d2d/docker-compose.yml b/linux/7d2d/docker-compose.yml
index 6fc45c7..4797ef3 100644
--- a/linux/7d2d/docker-compose.yml
+++ b/linux/7d2d/docker-compose.yml
@@ -8,5 +8,5 @@ services:
       - "8080-8081:8080-8081"
     restart: always
     volumes:
-      - ./vol:/valve/volume
+      - /docker/7test/vol:/valve/volume
 
diff --git a/linux/7d2d/vol/serverconfig.xml b/linux/7d2d/vol/serverconfig.xml
index e4af61b..9535ddc 100755
--- a/linux/7d2d/vol/serverconfig.xml
+++ b/linux/7d2d/vol/serverconfig.xml
@@ -3,17 +3,17 @@
         <!-- GENERAL SERVER SETTINGS -->
 
         <!-- Server representation -->
-        <property name="ServerName"                                     value="[DBZ] 7d2d dedicated server 24/7"/>              <!-- Whatever you want the name of the server to be. -->
+        <property name="ServerName"                                             value="[DBZ] 7d2d dedicated server 24/7"/>              <!-- Whatever you want the name of the server to be. -->
         <property name="ServerDescription"                              value="A 7 Days to Die server"/>        <!-- Whatever you want the server description to be, will be shown in the server browser. -->
         <property name="ServerWebsiteURL"                               value=""/>                                      <!-- Website URL for the server, will be shown in the serverbrowser as a clickable link -->
         <property name="ServerPassword"                                 value=""/>                                      <!-- Password to gain entry to the server -->
         <property name="ServerLoginConfirmationText"    value="" />                                     <!-- If set the user will see the message during joining the server and has to confirm it before continuing. For more complex changes to this window you can change the "serverjoinrulesdialog" window in XUi -->
 
         <!-- Networking -->
-        <property name="ServerPort"                     value="26900"/>                         <!-- Port you want the server to listen on. -->
-        <property name="ServerVisibility"               value="2"/>             <!-- Visibility of this server: 2 = public, 1 = only shown to friends, 0 = not listed. As you are never friend of a dedicated server setting this to "1" will only work when the first player connects manually by IP. -->
-        <property name="ServerDisabledNetworkProtocols" value=""/>       <!-- Networking protocols that should not be used. Separated by comma. Possible values: LiteNetLib, SteamNetworking. Dedicated servers should disable SteamNetworking if there is no NAT router in between your users and the server or when port-forwarding is set up correctly -->
-        <property name="ServerMaxWorldTransferSpeedKiBs" value="512"/>                  <!-- Maximum (!) speed in kiB/s the world is transferred at to a client on first connect if it does not have the world yet. Maximum is about 1300 kiB/s, even if you set a higher value. -->
+        <property name="ServerPort"                                             value="26900"/>                         <!-- Port you want the server to listen on. -->
+        <property name="ServerVisibility"                               value="2"/>                                     <!-- Visibility of this server: 2 = public, 1 = only shown to friends, 0 = not listed. As you are never friend of a dedicated server setting this to "1" will only work when the first player connects manually by IP. -->
+        <property name="ServerDisabledNetworkProtocols" value=""/>     <!-- Networking protocols that should not be used. Separated by comma. Possible values: LiteNetLib, SteamNetworking. Dedicated servers should disable SteamNetworking if there is no NAT router in between your users and the server or when port-forwarding is set up correctly -->
+        <property name="ServerMaxWorldTransferSpeedKiBs" value="512"/>                          <!-- Maximum (!) speed in kiB/s the world is transferred at to a client on first connect if it does not have the world yet. Maximum is about 1300 kiB/s, even if you set a higher value. -->
 
         <!-- Slots -->
         <property name="ServerMaxPlayerCount"                   value="8"/>                                     <!-- Maximum Concurrent Players -->
@@ -54,7 +54,7 @@
         <property name="GameWorld"                                              value="Navezgane"/>                     <!-- "RWG" (see WorldGenSeed and WorldGenSize options below) or any already existing world name in the Worlds folder (currently shipping with e.g. "Navezgane", "PREGEN01", ...) -->
         <property name="WorldGenSeed"                                   value="asdf"/>                          <!-- If RWG this is the seed for the generation of the new world. If a world with the resulting name already exists it will simply load it -->
         <property name="WorldGenSize"                                   value="4096"/>                          <!-- If RWG this controls the width and height of the created world. It is also used in combination with WorldGenSeed to create the internal RWG seed thus also creating a unique map name even if using the same WorldGenSeed. Has to be between 2048 and 16384, though large map sizes will take long to generate / download / load -->
-        <property name="GameName"                                               value="dbz-7d2d-dedicated"/>                       <!-- Whatever you want the game name to be. This affects the save game name as well as the seed used when placing decoration (trees etc) in the world. It does not control the generic layout of the world if creating an RWG world -->
+        <property name="GameName"                                               value="My Game"/>                       <!-- Whatever you want the game name to be. This affects the save game name as well as the seed used when placing decoration (trees etc) in the world. It does not control the generic layout of the world if creating an RWG world -->
         <property name="GameMode"                                               value="GameModeSurvival"/>      <!-- GameModeSurvival -->
 
         <!-- Difficulty -->