From c45ec533fc8670d334c00223b5b7c95626fefa29 Mon Sep 17 00:00:00 2001
From: Dat <dat.nguyen@wikimedia.de>
Date: Thu, 22 Jan 2026 01:33:12 +0100
Subject: [PATCH 1/5] Fix generated URLs to include :8001 in docker compose dev
 env

Bug: T414813
---
 dist-persist/wbstack/src/Settings/LocalSettings.php | 2 +-
 dist/wbstack/src/Settings/LocalSettings.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php
index 7f0cfecc7..b03bd2400 100644
--- a/dist-persist/wbstack/src/Settings/LocalSettings.php
+++ b/dist-persist/wbstack/src/Settings/LocalSettings.php
@@ -95,7 +95,7 @@
 }
 
 if ( $wwDockerCompose ) {
-    $wgServer = "http://" . $wikiInfo->domain;
+    $wgServer = "http://" . $wikiInfo->domain . ":8001";
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
 }
diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php
index 7f0cfecc7..b03bd2400 100644
--- a/dist/wbstack/src/Settings/LocalSettings.php
+++ b/dist/wbstack/src/Settings/LocalSettings.php
@@ -95,7 +95,7 @@
 }
 
 if ( $wwDockerCompose ) {
-    $wgServer = "http://" . $wikiInfo->domain;
+    $wgServer = "http://" . $wikiInfo->domain . ":8001";
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
 }

From a87373b2f4c397edf8a1a771ca073e4caa33a408 Mon Sep 17 00:00:00 2001
From: Dat <dat.nguyen@wikimedia.de>
Date: Mon, 26 Jan 2026 12:25:47 +0100
Subject: [PATCH 2/5] Pass localhost port as a variable

---
 dist-persist/wbstack/src/Settings/LocalSettings.php | 3 ++-
 dist/wbstack/src/Settings/LocalSettings.php         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php
index b03bd2400..8269f0b4b 100644
--- a/dist-persist/wbstack/src/Settings/LocalSettings.php
+++ b/dist-persist/wbstack/src/Settings/LocalSettings.php
@@ -95,7 +95,8 @@
 }
 
 if ( $wwDockerCompose ) {
-    $wgServer = "http://" . $wikiInfo->domain . ":8001";
+    $wwPort = getenv('MW_LOCAL_HOST_PORT');
+    $wgServer = "http://" . $wikiInfo->domain . ":" . $wwPort;
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
 }
diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php
index b03bd2400..8269f0b4b 100644
--- a/dist/wbstack/src/Settings/LocalSettings.php
+++ b/dist/wbstack/src/Settings/LocalSettings.php
@@ -95,7 +95,8 @@
 }
 
 if ( $wwDockerCompose ) {
-    $wgServer = "http://" . $wikiInfo->domain . ":8001";
+    $wwPort = getenv('MW_LOCAL_HOST_PORT');
+    $wgServer = "http://" . $wikiInfo->domain . ":" . $wwPort;
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
 }

From 2e84c2d5f2e90d3aee94b1fb11ed638d8568dffd Mon Sep 17 00:00:00 2001
From: Dat <dat.nguyen@wikimedia.de>
Date: Mon, 26 Jan 2026 13:50:43 +0100
Subject: [PATCH 3/5] Add 'MW_LOCAL_HOST_PORT' variable

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 292a152b2..aba961442 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -39,6 +39,8 @@ services:
       - MW_REDIS_CACHE_SERVER_WRITE=redis.svc
       - MW_REDIS_PASSWORD=
 
+      - MW_LOCAL_HOST_PORT=8001
+
     volumes:
       - "./dist:/var/www/html/w:cached"
       - ./docker-compose/php.ini:/usr/local/etc/php/php.ini

From 91775effc83b4ab57234461382f15a76c0965197 Mon Sep 17 00:00:00 2001
From: Dat WMDE <dat.nguyen@wikimedia.de>
Date: Mon, 26 Jan 2026 15:48:50 +0100
Subject: [PATCH 4/5] Update
 dist-persist/wbstack/src/Settings/LocalSettings.php

Co-authored-by: Thomas Arrow <tarrow@users.noreply.github.com>
---
 dist-persist/wbstack/src/Settings/LocalSettings.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php
index 8269f0b4b..1583bd33b 100644
--- a/dist-persist/wbstack/src/Settings/LocalSettings.php
+++ b/dist-persist/wbstack/src/Settings/LocalSettings.php
@@ -95,8 +95,7 @@
 }
 
 if ( $wwDockerCompose ) {
-    $wwPort = getenv('MW_LOCAL_HOST_PORT');
-    $wgServer = "http://" . $wikiInfo->domain . ":" . $wwPort;
+    $wgServer = "http://" . $wikiInfo->domain . ":" . getenv('MW_LOCAL_HOST_PORT');
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
 }

From 62ea04b04db4e583c03b74d088b9f23ef26f8232 Mon Sep 17 00:00:00 2001
From: Dat <dat.nguyen@wikimedia.de>
Date: Mon, 26 Jan 2026 15:53:53 +0100
Subject: [PATCH 5/5] sync with dist

---
 dist/wbstack/src/Settings/LocalSettings.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php
index 8269f0b4b..1583bd33b 100644
--- a/dist/wbstack/src/Settings/LocalSettings.php
+++ b/dist/wbstack/src/Settings/LocalSettings.php
@@ -95,8 +95,7 @@
 }
 
 if ( $wwDockerCompose ) {
-    $wwPort = getenv('MW_LOCAL_HOST_PORT');
-    $wgServer = "http://" . $wikiInfo->domain . ":" . $wwPort;
+    $wgServer = "http://" . $wikiInfo->domain . ":" . getenv('MW_LOCAL_HOST_PORT');
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
 }