From c2c48faad8ea220676a280cfe17febb04ded6549 Mon Sep 17 00:00:00 2001 From: fullsizemalt <106900403+fullsizemalt@users.noreply.github.com> Date: Sun, 21 Dec 2025 00:10:14 -0800 Subject: [PATCH] chore: Make traefik network configurable and fix DB name --- docker-compose.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 39110e2..40bb757 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: retries: 3 networks: - elmeg - - traefik + - ${TRAEFIK_NETWORK:-traefik} labels: - "traefik.enable=true" - "traefik.http.routers.elmeg-backend.rule=(Host(`elmeg.runfoo.run`) || Host(`elmeg.xyz`)) && PathPrefix(`/api`)" @@ -33,7 +33,7 @@ services: - "traefik.http.routers.elmeg-backend.middlewares=elmeg-strip" - "traefik.http.routers.elmeg-backend.service=elmeg-backend-svc" - "traefik.http.services.elmeg-backend-svc.loadbalancer.server.port=8000" - - "traefik.docker.network=traefik" + - "traefik.docker.network=${TRAEFIK_NETWORK:-traefik}" # Direct routes for docs (no strip) - "traefik.http.routers.elmeg-backend-docs.rule=(Host(`elmeg.runfoo.run`) || Host(`elmeg.xyz`)) && PathPrefix(`/docs`, `/openapi.json`)" - "traefik.http.routers.elmeg-backend-docs.entrypoints=websecure" @@ -51,14 +51,14 @@ services: - ./frontend:/app - /app/node_modules environment: - - NEXT_PUBLIC_API_URL=https://elmeg.runfoo.run/api + - NEXT_PUBLIC_API_URL=/api - INTERNAL_API_URL=http://backend:8000 depends_on: - backend restart: unless-stopped networks: - elmeg - - traefik + - ${TRAEFIK_NETWORK:-traefik} labels: - "traefik.enable=true" - "traefik.http.routers.elmeg-frontend.rule=(Host(`elmeg.runfoo.run`) || Host(`elmeg.xyz`)) && !PathPrefix(`/api`, `/docs`, `/openapi.json`)" @@ -66,19 +66,19 @@ services: - "traefik.http.routers.elmeg-frontend.tls.certresolver=letsencrypt" - "traefik.http.routers.elmeg-frontend.priority=50" - "traefik.http.services.elmeg-frontend.loadbalancer.server.port=3000" - - "traefik.docker.network=traefik" + - "traefik.docker.network=${TRAEFIK_NETWORK:-traefik}" db: image: postgres:15-alpine environment: - POSTGRES_USER=elmeg - POSTGRES_PASSWORD=elmeg_password - - POSTGRES_DB=elmeg_db + - POSTGRES_DB=elmeg volumes: - postgres_data:/var/lib/postgresql/data restart: unless-stopped healthcheck: - test: [ "CMD-SHELL", "pg_isready -U elmeg" ] + test: [ "CMD-SHELL", "pg_isready -U elmeg -d elmeg" ] interval: 10s timeout: 5s retries: 5 @@ -92,5 +92,5 @@ volumes: networks: elmeg: - traefik: + ${TRAEFIK_NETWORK:-traefik}: external: true