From 36efe6c703ec6f7475b97fc92b61c3a4243c3047 Mon Sep 17 00:00:00 2001
From: lduriez <lduriez@ankama.com>
Date: Wed, 17 Jul 2019 17:27:06 +0200
Subject: [PATCH] add env/arg sa & adm passwd + correcting docker restart
 behavior

---
 Dockerfile             | 12 ++++++++----
 README.md              |  8 ++++++--
 RunTrackmaniaServer.sh | 10 ++++++++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 077a8f8..200375e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:disco
+FROM debian:stretch-slim
 
 RUN mkdir /opt/tmserver
 
@@ -10,14 +10,18 @@ RUN unzip /opt/tmserver/TrackmaniaServer_2011-02-21.zip -d /opt/tmserver
 COPY custom_game_settings.txt /opt/tmserver/GameData/Tracks/MatchSettings/
 COPY RunTrackmaniaServer.sh /opt/tmserver/
 
-ARG SERVER_NAME='$w$F60DSI-$F90Ankama'
-ARG SERVER_DESC='Bienvenue sur le serveur docker Trackmania de la team DSI'
+ARG SERVER_NAME='Trackmania Server'
+ARG SERVER_DESC='This is a Trackmania Server'
+ARG SERVER_SA_PASSWORD='SuperAdmin'
+ARG SERVER_ADM_PASSWORD='Admin'
 ENV SERVER_NAME $SERVER_NAME
 ENV SERVER_DESC $SERVER_DESC
+ENV SERVER_SA_PASSWORD $SERVER_SA_PASSWORD
+ENV SERVER_ADM_PASSWORD $SERVER_ADM_PASSWORD
 
 EXPOSE 5000/tcp
 EXPOSE 2350/tcp
 EXPOSE 2350/udp
 EXPOSE 3450/tcp
 
-ENTRYPOINT ["/opt/tmserver/RunTrackmaniaServer.sh"]
+CMD ["/opt/tmserver/RunTrackmaniaServer.sh"]
diff --git a/README.md b/README.md
index 2379399..e2295b8 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ Trackmania Nation Forever Docker Server
 
 You can find it on Docker Hub [lduriez/tmserver](https://hub.docker.com/r/lduriez/tmserver)
 
+Only lan dedicated is enable (internet dedicated will be added in future version)
+
 ## Exposed ports :
 * 2350/tcp game server port
 * 2350/udp game server port
@@ -10,5 +12,7 @@ You can find it on Docker Hub [lduriez/tmserver](https://hub.docker.com/r/ldurie
 * 5000/tcp xmlrpc remote control port
 
 ## Environment variables :
-* SERVER_NAME name of your server
-* SERVER_DESC description of your server
+* SERVER_NAME name of your server (default is 'Trackmania Server')
+* SERVER_DESC description of your server (default is 'This is a Trackmania Server')
+* SERVER_SA_PASSWORD superadmin management password  (default is 'SuperAdmin')
+* SERVER_ADM_PASSWORD admin management password (default is 'Admin')
diff --git a/RunTrackmaniaServer.sh b/RunTrackmaniaServer.sh
index b0527bd..3396ff9 100755
--- a/RunTrackmaniaServer.sh
+++ b/RunTrackmaniaServer.sh
@@ -1,8 +1,14 @@
 #!/bin/sh
 
-sed -i "s/<name>/<name>${SERVER_NAME}/" /opt/tmserver/GameData/Config/dedicated_cfg.txt
-sed -i "s/<comment>/<comment>${SERVER_DESC}/" /opt/tmserver/GameData/Config/dedicated_cfg.txt
+echo "Setting ENV/ARG variables"
+sed -i "s/<password>SuperAdmin/<password>${SERVER_SA_PASSWORD}/" /opt/tmserver/GameData/Config/dedicated_cfg.txt
+sed -i "s/<password>Admin/<password>${SERVER_ADM_PASSWORD}/" /opt/tmserver/GameData/Config/dedicated_cfg.txt
+sed -i "s/<name></<name>${SERVER_NAME}</" /opt/tmserver/GameData/Config/dedicated_cfg.txt
+sed -i "s/<comment></<comment>${SERVER_DESC}</" /opt/tmserver/GameData/Config/dedicated_cfg.txt
 sed -i "s/<xmlrpc_allowremote>False/<xmlrpc_allowremote>True/" /opt/tmserver/GameData/Config/dedicated_cfg.txt
+
+echo "Server config dedicated_cfg.txt is"
 cat /opt/tmserver/GameData/Config/dedicated_cfg.txt
 
+echo "Launching Server"
 exec ./TrackmaniaServer /dedicated_cfg=dedicated_cfg.txt /game_settings=MatchSettings/custom_game_settings.txt /nodaemon /lan