From 4ab2ddf4333b885b3c91687b4a045b709feaabfe Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Fri, 14 Nov 2025 16:02:03 +0100
Subject: [PATCH] chore: remove networking config options when running under
 docker This should make it hopefully ever so slightly less confusing.

---
 docker-compose.yml                  | 3 ++-
 docker-entrypoint.sh                | 4 ++--
 src/helpers/commandLineArguments.ts | 5 +++++
 src/services/configService.ts       | 5 +++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 97bbcc4b..c2747233 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,12 +7,13 @@ services:
             - ./docker-data/static-data:/app/static/data
             - ./docker-data/logs:/app/logs
         ports:
+            # The lefthand value determines the port you actually connect to. Within the container, SpaceNinjaServer will always use 80 and 443 (righthand values).
             - 80:80
             - 443:443
 
         # Normally, the image is fetched from Docker Hub, but you can use the local Dockerfile by removing "image" above and adding this:
         #build: .
-        # Works best when using `docker-compose up --force-recreate --build`.
+        # Works best when using `docker compose up --force-recreate --build`.
 
         depends_on:
             - mongodb
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 44f3cb95..ffbac493 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,7 +2,7 @@
 set -e
 
 if [ ! -f conf/config.json ]; then
-	jq --arg value "mongodb://mongodb:27017/openWF" '.mongodbUrl = $value' /app/config-vanilla.json > /app/conf/config.json
+	jq --arg value "mongodb://mongodb:27017/openWF" '.mongodbUrl = $value | del(.bindAddress) | del(.httpPort) | del(.httpsPort)' /app/config-vanilla.json > /app/conf/config.json
 fi
 
-exec npm run raw -- --configPath conf/config.json
+exec npm run raw -- --configPath conf/config.json --docker
diff --git a/src/helpers/commandLineArguments.ts b/src/helpers/commandLineArguments.ts
index 09af105d..dd3dd81b 100644
--- a/src/helpers/commandLineArguments.ts
+++ b/src/helpers/commandLineArguments.ts
@@ -2,6 +2,7 @@ interface IArguments {
     configPath?: string;
     dev?: boolean;
     secret?: string;
+    docker?: boolean;
 }
 
 export const args: IArguments = {};
@@ -19,5 +20,9 @@ for (let i = 2; i < process.argv.length; ) {
         case "--secret":
             args.secret = process.argv[i++];
             break;
+
+        case "--docker":
+            args.docker = true;
+            break;
     }
 }
diff --git a/src/services/configService.ts b/src/services/configService.ts
index 81e238b9..24404b0d 100644
--- a/src/services/configService.ts
+++ b/src/services/configService.ts
@@ -160,6 +160,11 @@ export const configRemovedOptionsKeys = [
     "relicRewardItemCountMultiplier",
     "nightwaveStandingMultiplier"
 ];
+if (args.docker) {
+    configRemovedOptionsKeys.push("bindAddress");
+    configRemovedOptionsKeys.push("httpPort");
+    configRemovedOptionsKeys.push("httpsPort");
+}
 
 export const configPath = path.join(repoDir, args.configPath ?? "config.json");