Replace mc-proxy with socat

Author: g3force

Readme.md

@@ -61,6 +61,7 @@ pip install jinja2 requests
 Now, you can spin up the field:
 ```shell
 # Start all containers and keep showing the log in the foreground (ctrl+c will stop everything again)
+docker compose build
 docker compose up
 # Or alternatively run all containers in the background:
 docker compose up -d

docker-compose.yaml

@@ -98,14 +98,15 @@ services:
       - expose
 
   ssl-game-controller-public:
-    image: g3force/proxy-tcp-udp-mc:0.2.1
-    command:
-      - "tcp,:10007,ssl-game-controller-private:10007,AutoRef"
-      - "tcp,:10008,ssl-game-controller-private:10008,Team"
-      - "tcp,:10011,ssl-game-controller-private:10011,RemoteCtrl"
-      - "mc,224.5.23.1:11003,224.5.23.1:10003,Referee"
-      - "mc,224.5.23.2:10006,224.5.23.2:11006,Vision"
-      - "mc,224.5.23.2:10010,224.5.23.2:11010,Tracker"
+    image: multisocat
+    build: ./src/multisocat
+    environment:
+      SOCAT_AUTOREF: "TCP4-LISTEN:10007,fork TCP4:ssl-game-controller-private:10007"
+      SOCAT_TEAM: "TCP4-LISTEN:10008,fork TCP4:ssl-game-controller-private:10008"
+      SOCAT_REMOTECTRL: "TCP4-LISTEN:10011,fork TCP4:ssl-game-controller-private:10011"
+      SOCAT_REFEREE: "UDP-LISTEN:224.5.23.1:11003 UDP4:224.5.23.1:10003"
+      SOCAT_VISION: "UDP-LISTEN:224.5.23.2:10006 UDP4:224.5.23.2:11006"
+      SOCAT_TRACKER: "UDP-LISTEN:224.5.23.2:10010 UDP4:224.5.23.2:11010"
     restart: unless-stopped
     ports:
       - "10007/tcp"
@@ -131,13 +132,14 @@ services:
       - simulator
 
   simulator:
-    image: g3force/proxy-tcp-udp-mc:0.2.1
-    command:
-      - "udp,:10301,simulator-private:10301,Blue"
-      - "udp,:10302,simulator-private:10302,Yellow"
-      - "mc,224.5.23.2:10020,224.5.23.2:10006,Vision"
-      - "mc,224.5.23.1:10003,224.5.23.1:11003,Referee"
-      - "mc,224.5.23.2:10010,224.5.23.2:11010,Tracker"
+    image: multisocat
+    build: ./src/multisocat
+    environment:
+      SOCAT_BLUE: "UDP-LISTEN:10301 simulator-private:10301"
+      SOCAT_YELLOW: "UDP-LISTEN:10302 simulator-private:10302"
+      SOCAT_VISION: "UDP-LISTEN:224.5.23.2:10020 224.5.23.2:10006"
+      SOCAT_REFEREE: "UDP-LISTEN:224.5.23.1:10003 224.5.23.1:11003"
+      SOCAT_TRACKER: "UDP-LISTEN:224.5.23.2:10010 224.5.23.2:11010"
     restart: unless-stopped
     ports:
       - "10300/udp"

init/bootstrap_ubuntu_server.sh

@@ -58,6 +58,7 @@ echo -n "${ROOT_DOMAIN}" >config/root_domain
 echo -n "${FIELD_NAME}" >config/field_name
 ./config/docker/init.sh
 ./config/caddy/generate_caddyfile.py
+docker compose build
 docker compose pull --quiet
 docker compose up -d
 sleep 30s

init/update.sh

@@ -11,7 +11,8 @@ git pull
 ./config/caddy/update_caddy_passwords.sh
 ./config/caddy/generate_caddyfile.py
 ./config/caddy/update_caddy_config.sh
-docker compose -f docker-compose.yaml -f docker-compose-teams.yaml -f docker-compose-monitoring.yaml pull
+docker compose -f docker-compose.yaml -f docker-compose-teams.yaml -f docker-compose-monitoring.yaml build
+docker compose -f docker-compose.yaml -f docker-compose-teams.yaml -f docker-compose-monitoring.yaml pull --ignore-buildable
 docker compose -f docker-compose.yaml -f docker-compose-teams.yaml -f docker-compose-monitoring.yaml up -d
 
 #cp ./init/referee_access_cron /etc/cron.d/

src/multisocat/Dockerfile

@@ -0,0 +1,6 @@
+FROM python:3.13-alpine
+RUN apk add --no-cache socat
+CMD [ "/multisocat.py" ]
+COPY  multisocat.py /multisocat.py
+RUN chmod 0755 /multisocat.py
+USER nobody

src/multisocat/multisocat.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+import os
+import subprocess
+import signal
+
+processes = []
+for key in os.environ.keys():
+    if key.startswith("SOCAT_"):
+        processes.append(
+            subprocess.Popen(["socat"] + os.environ.get(key).split(" ")))
+
+
+def terminate_processes():
+    for process in processes:
+        process.terminate()
+
+
+signal.signal(signal.SIGTERM, terminate_processes)
+
+for process in processes:
+    process.wait()

src/multisocat/multisocat.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+set -euo pipefail
+
+# Get all environment variables starting with "MULTISOCAT_"
+# and convert them to the format "MULTISOCAT_<name>=<value>"
+# to pass them to the multisocat script.
+env | grep '^MULTISOCAT_' | while read -r line; do
+  export "$line"
+done