Skip to content

Commit

Permalink
fixed the server name in the dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm committed Jul 28, 2024
1 parent cdc374c commit 50f6edd
Show file tree
Hide file tree
Showing 5 changed files with 1,714 additions and 1,716 deletions.
9 changes: 4 additions & 5 deletions docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ services:
TZ: Europe/Berlin
NUXT_PUBLIC_MAPS_URL: https://nav.tum.de/maps
NUXT_PUBLIC_CDN_URL: http://data:3002
NUXT_PUBLIC_API_URL: http://main-api:3003
NUXT_PUBLIC_API_URL: http://api:3003
depends_on:
data:
condition: service_healthy
main-api:
api:
condition: service_healthy
# cdn
data:
Expand All @@ -22,11 +22,10 @@ services:
TZ: Europe/Berlin
ports:
- "3002:3002"
# server
main-api:
api:
restart: unless-stopped
build: ./server
command: /bin/navigatum-main-api
command: /bin/navigatum-server
ports:
- "3003:3003"
user: 1000:3000
Expand Down
15 changes: 7 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
condition: service_healthy
data:
condition: service_healthy
main-api:
server:
condition: service_healthy
# maps
tileserver-init-config:
Expand Down Expand Up @@ -117,21 +117,20 @@ services:
TZ: Europe/Berlin
expose:
- "3002"
# server
main-api:
server:
image: ghcr.io/tum-dev/navigatum-server:main
restart: unless-stopped
labels:
- "traefik.enable=true"
- "traefik.http.routers.navigatum-main-api.entrypoints=webs"
- "traefik.http.routers.navigatum-main-api.tls.certresolver=leacme"
- "traefik.http.routers.navigatum-main-api.rule=Host(`nav.tum.de`) && (PathPrefix(`/api/locations/`) || Path(`/api/search`) || PathPrefix(`/api/feedback/`) || Path(`/api/calendar`) || Path(`/api/status`) || Path(`/api/metrics`))"
- "traefik.http.services.navigatum-main-api.loadbalancer.server.port=3003"
- "traefik.http.routers.navigatum-server.entrypoints=webs"
- "traefik.http.routers.navigatum-server.tls.certresolver=leacme"
- "traefik.http.routers.navigatum-server.rule=Host(`nav.tum.de`) && (PathPrefix(`/api/locations/`) || PathPrefix(`/api/get/`) || PathPrefix(`/api/preview/`) || Path(`/api/search`) || PathPrefix(`/api/feedback/`) || Path(`/api/calendar`) || Path(`/api/status`) || Path(`/api/metrics`))"
- "traefik.http.services.navigatum-server.loadbalancer.server.port=3003"
networks:
- traefik_traefik
expose:
- "3003"
command: /bin/navigatum-main-api
command: /bin/navigatum-server
user: 1000:3000
environment:
TZ: Europe/Berlin
Expand Down
Loading

0 comments on commit 50f6edd

Please sign in to comment.