Skip to content

Pre production #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TylerAdamMartinez merged 2 commits into from
Aug 18, 2026
Merged

Pre production #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fecb47
fix(docker-compose): stop exposing Traefik's insecure dashboard/API p…
TylerAdamMartinez Aug 18, 2026
9898a09
fix(docker-compose): add explicit routing for frontend & backend serv…
TylerAdamMartinez Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions docker-compose.development.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ services:
VITE_API_URL: https://metermanager-dev.pvacd.com/api/v1
env_file:
- ./frontend/.env.devserver
ports:
- "5173:80"
depends_on:
- api
- traefik
Expand All @@ -22,7 +20,7 @@ services:

# Current PVACD hostname
- "traefik.http.routers.frontend.rule=Host(`metermanager-dev.pvacd.com`)"
- "traefik.http.routers.frontend.entrypoints=websecure,web"
- "traefik.http.routers.frontend.entrypoints=websecure"
- "traefik.http.routers.frontend.tls=true"
- "traefik.http.routers.frontend.tls.certresolver=myresolver"

Expand All @@ -38,9 +36,8 @@ services:
- "traefik.http.middlewares.pvacd-redirect.redirectregex.replacement=https://metermanager-dev.pvacd.com/$${1}"
- "traefik.http.middlewares.pvacd-redirect.redirectregex.permanent=true"

# - "traefik.http.routers.frontend-insecure.middlewares=force-secure"
# - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https"
# - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"
- "traefik.http.routers.frontend.priority=10"
- "traefik.http.services.frontend.loadbalancer.server.port=80"

api:
build:
Expand All @@ -63,8 +60,6 @@ services:
--port 8000
--proxy-headers
--root-path /api/v1
ports:
- "8000:8000"
volumes:
- ./api:/app/api
depends_on:
Expand All @@ -73,24 +68,22 @@ services:
- ./api/.env_devserver
labels:
- "traefik.enable=true"

- "traefik.http.routers.api.rule=Host(`metermanager-dev.pvacd.com`) && PathPrefix(`/api/v1`)"
- "traefik.http.routers.api.entrypoints=websecure"
- "traefik.http.routers.api.tls=true"
- "traefik.http.routers.api.tls.certresolver=myresolver"
- "traefik.http.routers.api.priority=100"

- "traefik.http.routers.api.middlewares=api-sp"
- "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api/v1"
- "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false"
- "traefik.http.routers.api-insecure.rule=Host(`metermanager-dev.pvacd.com`) && PathPrefix(`/api/v1`)"
- "traefik.http.routers.api-insecure.entrypoints=web"

# - "traefik.http.routers.api-insecure.middlewares=force-secure"
# - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https"
# - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"
- "traefik.http.services.api.loadbalancer.server.port=8000"

traefik:
image: "traefik:v2.11"
command:
- "--api.insecure=true"
- "--providers.docker=true"
- "--providers.docker.exposedbydefault=false"
- "--entrypoints.web.address=:80"
Expand All @@ -106,7 +99,6 @@ services:
ports:
- "80:80"
- "443:443"
- "8080:8080"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock:ro"
- ./letsencrypt:/letsencrypt
22 changes: 7 additions & 15 deletions docker-compose.production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ services:
VITE_API_URL: https://metermanager.pvacd.com/api/v1
env_file:
- ./frontend/.env.production
ports:
- "5173:80"
depends_on:
- api
- traefik
Expand All @@ -22,7 +20,7 @@ services:

# Current PVACD hostname
- "traefik.http.routers.frontend.rule=Host(`metermanager.pvacd.com`)"
- "traefik.http.routers.frontend.entrypoints=websecure,web"
- "traefik.http.routers.frontend.entrypoints=websecure"
- "traefik.http.routers.frontend.tls=true"
- "traefik.http.routers.frontend.tls.certresolver=myresolver"

Expand All @@ -38,9 +36,8 @@ services:
- "traefik.http.middlewares.pvacd-redirect.redirectregex.replacement=https://metermanager.pvacd.com/$${1}"
- "traefik.http.middlewares.pvacd-redirect.redirectregex.permanent=true"

# - "traefik.http.routers.frontend-insecure.middlewares=force-secure"
# - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https"
# - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"
- "traefik.http.routers.frontend.priority=10"
- "traefik.http.services.frontend.loadbalancer.server.port=80"

api:
build:
Expand All @@ -63,8 +60,6 @@ services:
--port 8000
--proxy-headers
--root-path /api/v1
ports:
- "8000:8000"
volumes:
- ./api:/app/api
depends_on:
Expand All @@ -73,24 +68,22 @@ services:
- ./api/.env_production
labels:
- "traefik.enable=true"

- "traefik.http.routers.api.rule=Host(`metermanager.pvacd.com`) && PathPrefix(`/api/v1`)"
- "traefik.http.routers.api.entrypoints=websecure"
- "traefik.http.routers.api.tls=true"
- "traefik.http.routers.api.tls.certresolver=myresolver"
- "traefik.http.routers.api.priority=100"

- "traefik.http.routers.api.middlewares=api-sp"
- "traefik.http.middlewares.api-sp.stripprefix.prefixes=/api/v1"
- "traefik.http.middlewares.api-sp.stripprefix.forceSlash=false"
- "traefik.http.routers.api-insecure.rule=Host(`metermanager.pvacd.com`) && PathPrefix(`/api/v1`)"
- "traefik.http.routers.api-insecure.entrypoints=web"

# - "traefik.http.routers.api-insecure.middlewares=force-secure"
# - "traefik.http.middlewares.force-secure.redirectscheme.scheme=https"
# - "traefik.http.middlewares.force-secure.redirectscheme.permanent=true"
- "traefik.http.services.api.loadbalancer.server.port=8000"

traefik:
image: "traefik:v2.11"
command:
- "--api.insecure=true"
- "--providers.docker=true"
- "--providers.docker.exposedbydefault=false"
- "--entrypoints.web.address=:80"
Expand All @@ -106,7 +99,6 @@ services:
ports:
- "80:80"
- "443:443"
- "8080:8080"
volumes:
- "/var/run/docker.sock:/var/run/docker.sock:ro"
- ./letsencrypt:/letsencrypt
Loading