From 73f9db290178b7f6e37c948970180d8dafe38705 Mon Sep 17 00:00:00 2001
From: Peter Holloway <peter.holloway@diamond.ac.uk>
Date: Fri, 15 May 2026 14:06:57 +0100
Subject: [PATCH 1/2] test: Include all ports in system compose file

The ports are not required when they're not being forwarded but
including them means there is one place to look to figure out which
server is running where.
---
 tests/system_tests/compose.yaml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/system_tests/compose.yaml b/tests/system_tests/compose.yaml
index 5b34f4784..ddb7a3825 100644
--- a/tests/system_tests/compose.yaml
+++ b/tests/system_tests/compose.yaml
@@ -8,14 +8,14 @@ services:
       - "8406:8000"
     security_opt:
       - label=disable
-    
+
   rabbitmq:
     image: docker.io/rabbitmq:4.0-management
     ports:
-      - "1883:1883"
-      - "5672:5672"
-      - "15672:15672"
-      - "61613:61613"
+      - "1883:1883" # mqtt
+      - "5672:5672" # amqp
+      - "15672:15672" # dashboard
+      - "61613:61613" # stomp
     volumes:
       - type: bind
         source: ./services/rabbitmq_plugins
@@ -48,6 +48,8 @@ services:
   tiled:
     image: ghcr.io/bluesky/tiled:0.2.4
     network_mode: host
+    ports:
+      - 8407:8407
     environment:
       - PYTHONPATH=/deploy/
     volumes:
@@ -62,6 +64,8 @@ services:
   opa:
     image: openpolicyagent/opa:edge-static-debug
     network_mode: host
+    ports:
+      - 8181:8181
     volumes:
       - "./services/opa_config:/mnt"
     environment:
@@ -72,6 +76,8 @@ services:
 
   blueapi-oauth2-proxy:
     network_mode: host
+    ports:
+      - 4180:4180
     image: "quay.io/oauth2-proxy/oauth2-proxy:v7.13.0"
     volumes:
       - ./services/blueapi-oauth2-proxy/:/opt/config
@@ -88,6 +94,8 @@ services:
 
   tiled-oauth2-proxy:
     network_mode: host
+    ports:
+      - 4181:4181
     image: "quay.io/oauth2-proxy/oauth2-proxy:v7.13.0"
     volumes:
       - ./services/tiled-oauth2-proxy/:/opt/config

From 1e50c35faaecc71d58e57e173845a385d0860309 Mon Sep 17 00:00:00 2001
From: Peter Holloway <peter.holloway@diamond.ac.uk>
Date: Fri, 15 May 2026 16:01:04 +0100
Subject: [PATCH 2/2] Use comments instead

---
 tests/system_tests/compose.yaml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tests/system_tests/compose.yaml b/tests/system_tests/compose.yaml
index ddb7a3825..a90323b48 100644
--- a/tests/system_tests/compose.yaml
+++ b/tests/system_tests/compose.yaml
@@ -47,9 +47,7 @@ services:
 
   tiled:
     image: ghcr.io/bluesky/tiled:0.2.4
-    network_mode: host
-    ports:
-      - 8407:8407
+    network_mode: host # Port 8407
     environment:
       - PYTHONPATH=/deploy/
     volumes:
@@ -63,9 +61,7 @@ services:
 
   opa:
     image: openpolicyagent/opa:edge-static-debug
-    network_mode: host
-    ports:
-      - 8181:8181
+    network_mode: host # Port 8181
     volumes:
       - "./services/opa_config:/mnt"
     environment:
@@ -75,9 +71,7 @@ services:
       - label=disable
 
   blueapi-oauth2-proxy:
-    network_mode: host
-    ports:
-      - 4180:4180
+    network_mode: host # Port 4180
     image: "quay.io/oauth2-proxy/oauth2-proxy:v7.13.0"
     volumes:
       - ./services/blueapi-oauth2-proxy/:/opt/config
@@ -93,9 +87,7 @@ services:
       - label=disable
 
   tiled-oauth2-proxy:
-    network_mode: host
-    ports:
-      - 4181:4181
+    network_mode: host # Port 4181
     image: "quay.io/oauth2-proxy/oauth2-proxy:v7.13.0"
     volumes:
       - ./services/tiled-oauth2-proxy/:/opt/config