added utmaster to docker compose

Author: chc

.env-local

@@ -25,4 +25,9 @@ OPENSPY_SM_BIND_PORT=30734
 OPENSPY_CDKEY_BIND_ADDR=0.0.0.0
 OPENSPY_CDKEY_BIND_PORT=30694
 OPENSPY_PEERCHAT_BIND_ADDR=0.0.0.0
-OPENSPY_PEERCHAT_BIND_PORT=30838
+OPENSPY_PEERCHAT_BIND_PORT=30838
+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=

Dockerfile

@@ -1,14 +1,14 @@
 FROM ubuntu:24.04 AS build
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update
 RUN apt-get install -y build-essential cmake git curl unzip zip pkg-config
 
 RUN git clone https://github.com/microsoft/vcpkg.git
-ENV VCPKG_ROOT /vcpkg
-ENV PATH "$PATH:$VCPKG_ROOT"
+ENV VCPKG_ROOT=/vcpkg
+ENV PATH="$PATH:$VCPKG_ROOT"
 WORKDIR /vcpkg
 RUN ./bootstrap-vcpkg.sh
-ENV VCPKG_TC_PATH "$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
+ENV VCPKG_TC_PATH="$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
 
 
 RUN mkdir /root/fs-out
@@ -41,19 +41,20 @@ COPY cmake /root/cmake
 COPY code /root/code
 RUN mkdir /root/os-bin /root/os-make
 WORKDIR /root/os-make
-run ../build.sh
-run make
+RUN ../build.sh
+RUN make
 RUN mkdir -p /root/fs-out/opt/openspy/bin /root/fs-out/opt/openspy/lib
 RUN mv /root/os-make/bin/* /root/fs-out/opt/openspy/bin
 RUN mv /root/os-make/lib/* /root/fs-out/opt/openspy/lib
 COPY docker-support/run.sh /root/fs-out/opt/openspy/run.sh
+COPY docker-support/utmaster.xml /root/fs-out/opt/openspy/
 RUN chmod a+x /root/fs-out/opt/openspy/run.sh
 
 WORKDIR /root/fs-out
 RUN tar -cvzf /fs-out.tar.gz *
 
 FROM ubuntu:24.04
-ENV DEBIAN_FRONTEND noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get -y dist-upgrade
 COPY --from=build /fs-out.tar.gz /root/fs.tar.gz
 RUN tar -xvzf /root/fs.tar.gz -C /

docker-compose.yaml

@@ -57,4 +57,11 @@ services:
       RUN_FILE: peerchat
     env_file: .env-local
     image: chcniz/openspy-core
+  utmaster:
+    ports:
+      - "28902:30839"
+    environment:
+      RUN_FILE: utmaster
+    env_file: .env-local
+    image: chcniz/openspy-core
 

docker-support/openspy.xml

@@ -18,5 +18,12 @@ if [[ -n $SSL_KEY_DATA ]]; then
     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