fix(compose/net): make web network mandatory

This commit is contained in:
jon r 2025-04-04 14:57:10 +02:00
parent 1a9dac03b8
commit 237f8ec111
2 changed files with 20 additions and 4 deletions

View File

@ -1,4 +1,11 @@
name: funkwhale-net name: funkwhale-net
networks:
web:
external: true
x-networks: &networks
- web
include: include:
- path: compose/net.dnsmasq.yml - path: compose/net.dnsmasq.yml
- path: compose/net.traefik.yml - path: compose/net.traefik.yml
@ -12,4 +19,14 @@ include:
# Comment out the following line if you have other containers # Comment out the following line if you have other containers
# present on the docker0 network. # present on the docker0 network.
- path: compose/net.helpers.docker0.yml - 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

View File

@ -1,7 +1,6 @@
x-verify: &verify x-verify: &verify
init: true init: true
image: 'busybox' image: "busybox"
network_mode: bridge
dns: 172.17.0.1 dns: 172.17.0.1
dns_search: funkwhale.test dns_search: funkwhale.test
@ -12,4 +11,4 @@ services:
verify-internal-connectivity: verify-internal-connectivity:
<<: *verify <<: *verify
command: 'ping -c 1 ${COMPOSE_PROJECT_NAME:-funkwhale}.funkwhale.test' command: "ping -c 1 ${COMPOSE_PROJECT_NAME:-funkwhale}.funkwhale.test"