From 237f8ec1117f434c0a5879c6123c3deec21b36f8 Mon Sep 17 00:00:00 2001
From: jon r <jon@allmende.io>
Date: Fri, 4 Apr 2025 14:57:10 +0200
Subject: [PATCH] fix(compose/net): make web network mandatory

---
 compose.net.yml        | 19 ++++++++++++++++++-
 compose/net.verify.yml |  5 ++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/compose.net.yml b/compose.net.yml
index 560c5a45e..ab28f2f44 100644
--- a/compose.net.yml
+++ b/compose.net.yml
@@ -1,4 +1,11 @@
 name: funkwhale-net
+networks:
+  web:
+    external: true
+
+x-networks: &networks
+  - web
+
 include:
   - path: compose/net.dnsmasq.yml
   - path: compose/net.traefik.yml
@@ -12,4 +19,14 @@ include:
   # Comment out the following line if you have other containers
   # present on the docker0 network.
   - path: compose/net.helpers.docker0.yml
-  - path: compose/net.verify.yml
+services:
+  verify-external-connectivity:
+    extends:
+      file: compose/net.verify.yml
+      service: verify-external-connectivity
+    networks: *networks
+  verify-internal-connectivity:
+    extends:
+      file: compose/net.verify.yml
+      service: verify-internal-connectivity
+    networks: *networks
diff --git a/compose/net.verify.yml b/compose/net.verify.yml
index a327fa066..8a6c8eb1a 100644
--- a/compose/net.verify.yml
+++ b/compose/net.verify.yml
@@ -1,7 +1,6 @@
 x-verify: &verify
   init: true
-  image: 'busybox'
-  network_mode: bridge
+  image: "busybox"
   dns: 172.17.0.1
   dns_search: funkwhale.test
 
@@ -12,4 +11,4 @@ services:
 
   verify-internal-connectivity:
     <<: *verify
-    command: 'ping -c 1 ${COMPOSE_PROJECT_NAME:-funkwhale}.funkwhale.test'
+    command: "ping -c 1 ${COMPOSE_PROJECT_NAME:-funkwhale}.funkwhale.test"