Remove embedded Caddy, join shared web network as tokyo-app container

1 files changed, 7 insertions, 17 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
index ad50b60..d9412c5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,6 @@
 services:
   app:
+    container_name: tokyo-app
     build:
       context: .
       target: app
@@ -11,6 +12,8 @@ services:
       - NODE_ENV=production
       - DB_PATH=/app/data/events.db
     restart: unless-stopped
+    networks:
+      - web
 
   scraper:
     build:
@@ -25,20 +28,7 @@ services:
       - app
     restart: unless-stopped
 
-  caddy:
-    image: caddy:2-alpine
-    ports:
-      - "80:80"
-      - "443:443"
-      - "443:443/udp"
-    volumes:
-      - ./Caddyfile:/etc/caddy/Caddyfile
-      - caddy_data:/data
-      - caddy_config:/config
-    depends_on:
-      - app
-    restart: unless-stopped
-
-volumes:
-  caddy_data:
-  caddy_config:
+networks:
+  web:
+    external: true
+    name: web