cleaned up docker compose

Author: chc

.env-local

@@ -30,4 +30,6 @@ OPENSPY_UTMASTER_BIND_ADDR=0.0.0.0
 OPENSPY_UTMASTER_BIND_PORT=30839
 OPENSPY_UTMASTER_MAPPINGS_PATH=utmaster.xml
 UTMASTER_MOTD_DATA=VGhpcyBpcyB0aGUgdXRtYXN0ZXIgZGVmYXVsdCBkb2NrZXIgbW90ZA==
-UTMASTER_MOTD_COMMUNITY_DATA=VGhpcyBpcyB0aGUgdXRtYXN0ZXIgZGVmYXVsdCBkb2NrZXIgY29tbXVuaXR5IG1vdGQ=
+UTMASTER_MOTD_COMMUNITY_DATA=VGhpcyBpcyB0aGUgdXRtYXN0ZXIgZGVmYXVsdCBkb2NrZXIgY29tbXVuaXR5IG1vdGQ=
+OPENSPY_FESL_TOS_PATH=fesl_tos.txt
+OPENSPY_SSL_CERT=ssl_cert.pem

docker-compose.yaml

@@ -8,60 +8,78 @@ services:
     environment:
       RUN_FILE: serverbrowsing
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
   qr:
     ports:
       - "27900:30694/udp"
     env_file: .env-local
     environment:
       RUN_FILE: qr
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
   natneg:
     ports:
       - "27901:30695/udp"
     environment:
       RUN_FILE: natneg
     env_file: .env-local
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
   GP:
     ports:
       - "29900:30974"
     environment:
       RUN_FILE: GP
     env_file: .env-local
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
   SM:
     ports:
       - "29901:30734"
     environment:
       RUN_FILE: SM
     env_file: .env-local
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
   gstats:
     ports:
       - "29920:30836"
     environment:
       RUN_FILE: gstats
     env_file: .env-local
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
   FESL-bf2142:
     ports:
       - "18300:30837"
     environment:
       RUN_FILE: FESL      
     env_file: .env-local
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
   peerchat:
     ports:
       - "6667:30838"
     environment:
       RUN_FILE: peerchat
     env_file: .env-local
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
   utmaster:
     ports:
       - "28902:30839"
     environment:
       RUN_FILE: utmaster
     env_file: .env-local
     image: chcniz/openspy-core
+    volumes:
+      - ./docker-support/:/app-workdir
 

docker-support/tos_battlefield.txt docker-support/fesl_tos.txtdocker-support/tos_battlefield.txt renamed to docker-support/fesl_tos.txt

@@ -0,0 +1 @@
+This is the utmaster default docker community motd

docker-support/motd-community.txt

@@ -0,0 +1 @@
+This is the utmaster default docker motd

docker-support/motd.txt

@@ -1,29 +1,5 @@
 RUN_FILE_BASEDIR=/opt/openspy/bin
-WORKDIR=/opt/openspy
+WORKDIR=/app-workdir
 FILE_TO_RUN=$RUN_FILE_BASEDIR/$RUN_FILE
 eval cd $WORKDIR
-
-#this stuff is for FESL/SSL, need to write from env var due to docker image
-if [[ -n $FESL_TOS_DATA ]]; then
-    echo $FESL_TOS_DATA | base64 -d > fesl_tos.txt
-    export OPENSPY_FESL_TOS_PATH=fesl_tos.txt
-fi
-if [[ -n $SSL_CERT_DATA ]]; then
-    echo $SSL_CERT_DATA | base64 -d > ssl_cert.pem
-    export OPENSSP_SSL_CERT=ssl_cert.pem
-fi
-
-if [[ -n $SSL_KEY_DATA ]]; then
-    echo $SSL_KEY_DATA | base64 -d > ssl_key.pem
-    export OPENSPY_SSL_KEY=ssl_key.pem
-fi
-
-if [[ -n $UTMASTER_MOTD_DATA ]]; then
-    echo $UTMASTER_MOTD_DATA | base64 -d > motd.txt
-fi
-
-if [[ -n $UTMASTER_MOTD_COMMUNITY_DATA ]]; then
-    echo $UTMASTER_MOTD_COMMUNITY_DATA | base64 -d > motd_community.txt
-fi
-
 eval bash -c $FILE_TO_RUN