revert: Caddy back to bridge network (host mode breaks OrbStack)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -9,9 +9,9 @@ voip.manko.yoga {
|
|||||||
|
|
||||||
# Audio bridge WebSocket (wzp-web)
|
# Audio bridge WebSocket (wzp-web)
|
||||||
handle_path /audio/* {
|
handle_path /audio/* {
|
||||||
reverse_proxy 172.28.0.30:8080
|
reverse_proxy wzp-web:8080
|
||||||
}
|
}
|
||||||
|
|
||||||
# Everything else → featherChat server
|
# Everything else → featherChat server
|
||||||
reverse_proxy 172.28.0.20:7700
|
reverse_proxy warzone-server:7700
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,13 +8,15 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
# ─── Caddy reverse proxy (TLS termination) ───
|
# ─── Caddy reverse proxy (TLS termination) ───
|
||||||
# Uses host network so it sees real client IPs (not Docker NAT)
|
|
||||||
caddy:
|
caddy:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile.caddy
|
dockerfile: Dockerfile.caddy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
network_mode: host
|
ports:
|
||||||
|
- "80:80"
|
||||||
|
- "443:443"
|
||||||
|
- "443:443/udp" # HTTP/3 (QUIC)
|
||||||
volumes:
|
volumes:
|
||||||
- ./Caddyfile:/etc/caddy/Caddyfile:ro
|
- ./Caddyfile:/etc/caddy/Caddyfile:ro
|
||||||
- caddy_data:/data
|
- caddy_data:/data
|
||||||
@@ -25,6 +27,9 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- warzone-server
|
- warzone-server
|
||||||
- wzp-web
|
- wzp-web
|
||||||
|
networks:
|
||||||
|
- frontend
|
||||||
|
- backend
|
||||||
|
|
||||||
# ─── featherChat server ───
|
# ─── featherChat server ───
|
||||||
warzone-server:
|
warzone-server:
|
||||||
@@ -33,15 +38,13 @@ services:
|
|||||||
dockerfile: warzone/deploy/docker/Dockerfile.server
|
dockerfile: warzone/deploy/docker/Dockerfile.server
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
# Browser connects to audio via Caddy: wss://voip.manko.yoga/audio/ws/ROOM
|
|
||||||
WZP_RELAY_ADDR: "voip.manko.yoga/audio"
|
WZP_RELAY_ADDR: "voip.manko.yoga/audio"
|
||||||
RUST_LOG: "info"
|
RUST_LOG: "info"
|
||||||
volumes:
|
volumes:
|
||||||
- server_data:/data
|
- server_data:/data
|
||||||
command: ["--bind", "0.0.0.0:7700", "--enable-bots"]
|
command: ["--bind", "0.0.0.0:7700", "--enable-bots"]
|
||||||
networks:
|
networks:
|
||||||
backend:
|
- backend
|
||||||
ipv4_address: 172.28.0.20
|
|
||||||
|
|
||||||
# ─── WZP QUIC relay (audio SFU) ───
|
# ─── WZP QUIC relay (audio SFU) ───
|
||||||
wzp-relay:
|
wzp-relay:
|
||||||
@@ -54,7 +57,7 @@ services:
|
|||||||
- "--listen"
|
- "--listen"
|
||||||
- "0.0.0.0:4433"
|
- "0.0.0.0:4433"
|
||||||
- "--auth-url"
|
- "--auth-url"
|
||||||
- "http://172.28.0.20:7700/v1/auth/validate"
|
- "http://warzone-server:7700/v1/auth/validate"
|
||||||
networks:
|
networks:
|
||||||
backend:
|
backend:
|
||||||
ipv4_address: 172.28.0.10
|
ipv4_address: 172.28.0.10
|
||||||
@@ -72,13 +75,12 @@ services:
|
|||||||
- "--relay"
|
- "--relay"
|
||||||
- "172.28.0.10:4433"
|
- "172.28.0.10:4433"
|
||||||
- "--auth-url"
|
- "--auth-url"
|
||||||
- "http://172.28.0.20:7700/v1/auth/validate"
|
- "http://warzone-server:7700/v1/auth/validate"
|
||||||
depends_on:
|
depends_on:
|
||||||
- wzp-relay
|
- wzp-relay
|
||||||
- warzone-server
|
- warzone-server
|
||||||
networks:
|
networks:
|
||||||
backend:
|
- backend
|
||||||
ipv4_address: 172.28.0.30
|
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
cf_api_token:
|
cf_api_token:
|
||||||
|
|||||||
Reference in New Issue
Block a user