Skip to content

Commit

Permalink
removed the buggy tileserver bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
CommanderStorm committed Jan 2, 2025
1 parent 97fe312 commit 69aa8bd
Show file tree
Hide file tree
Showing 11 changed files with 2,309 additions and 6,233 deletions.
5 changes: 2 additions & 3 deletions deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ We are confindent that even if we were to add more universities, more load would
On every of these nodes we run the following supporting services:

- [traefik](https://traefik.io/) as a reverse proxy
- [`prometeus`](https://prometheus.io/), [`alertmanager`](https://prometheus.io/docs/alerting/latest/alertmanager/), [`loki`](https://grafana.com/),
- [`prometeus`](https://prometheus.io/), [`alertmanager`](https://prometheus.io/docs/alerting/latest/alertmanager/), [
`loki`](https://grafana.com/),
and [`grafana`](https://grafana.com/), [uptime-kuma](https://github.com/louislam/uptime-kuma) for monitoring purposes
- [watchtower](https://containrrr.dev/watchtower/) to update our deployments

Expand All @@ -44,8 +45,6 @@ We run the following components at these paths:
- `/` [webclient](../webclient) written in [`Vue`](https://vuejs.org/)/[`nuxt-4`](https://nuxt.dev)
- `/api/` [server](../server) written in [`Rust`](https://www.rust-lang.org/)/[`actix-web`](https://actix.rs/)
- `/tiles/` [`martin`](https://martin.maplibre.org/) tiles from OSM
- `/map/` [`tileserver-gl`](https://github.com/maptiler/tileserver-gl) rendering tiles from OSM
slated to be removed in favor of `/tiles/`
- `/cdn` nginx server serving the static files we need
slated to be folded into the `server`-startup

Expand Down
2 changes: 0 additions & 2 deletions docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ services:
- "3000:3000"
environment:
TZ: Europe/Berlin
NUXT_PUBLIC_MAPS_URL: https://nav.tum.de/maps
NUXT_PUBLIC_CDN_URL: http://data:3002
NUXT_PUBLIC_API_URL: http://server:3003
# cdn
Expand All @@ -33,7 +32,6 @@ services:
LOG_LEVEL: ${LOG_LEVEL-debug}
MIELI_URL: http://meilisearch:7700
MEILI_MASTER_KEY: ${MEILI_MASTER_KEY}
TILESERVER_URL: https://nav.tum.de/maps
CDN_URL: http://data:3002/cdn
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_USER: ${POSTGRES_USER}
Expand Down
54 changes: 0 additions & 54 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,61 +14,8 @@ services:
- "3000"
environment:
TZ: Europe/Berlin
NUXT_PUBLIC_MAPS_URL: https://nav.tum.de
NUXT_PUBLIC_CDN_URL: https://nav.tum.de
NUXT_PUBLIC_API_URL: https://nav.tum.de
# maps
tileserver-init-config:
image: alpine:latest
command:
- /bin/sh
- -c
- |
rm -f /data/*.json
cp /map/*.json /data/
rm -fr /data/sprites/
mkdir -p /data/sprites/
cp /map/sprites/* /data/sprites/
rm -fr /data/styles/
mkdir -p /data/styles/
cp /map/styles/* /data/styles/
mkdir -p /data/fonts/
volumes:
- tileserver-src:/data
- ./map/:/map/:ro
environment:
TZ: Europe/Berlin
tileserver:
image: maptiler/tileserver-gl:v5.0.0
restart: unless-stopped
labels:
- "traefik.enable=true"
- "traefik.http.routers.navigatum-tileserver.entrypoints=webs"
- "traefik.http.routers.navigatum-tileserver.tls.certresolver=leacme"
- "traefik.http.routers.navigatum-tileserver.rule=Host(`nav.tum.de`) && PathPrefix(`/maps/`)"
- "traefik.http.routers.navigatum-tileserver.middlewares=navigatum-maps-stripprefix@docker, navigatum-compress@docker, navigatum-cache-2m@docker"
- "traefik.http.middlewares.navigatum-maps-stripprefix.stripprefix.prefixes=/maps"
- "traefik.http.middlewares.navigatum-compress.compress=true"
- "traefik.http.middlewares.navigatum-cache-2m.headers.customrequestheaders.Cache-Control=public, max-age=5184000"
- "traefik.http.services.navigatum-tileserver.loadbalancer.server.port=8080"
networks:
- traefik_traefik
expose:
- "8080"
command: /usr/src/app/docker-entrypoint.sh --public_url=https://nav.tum.de/maps/
environment:
TZ: Europe/Berlin
tmpfs:
- /tmp
volumes:
- tileserver-src:/data/:ro
read_only: true
depends_on:
tileserver-init-config:
condition: service_completed_successfully
# cdn
data:
image: ghcr.io/tum-dev/navigatum-data:main
Expand Down Expand Up @@ -105,7 +52,6 @@ services:
LOG_LEVEL: ${LOG_LEVEL-info}
MIELI_URL: http://meilisearch:7700
MEILI_MASTER_KEY: ${MEILI_MASTER_KEY}
TILESERVER_URL: http://tileserver:8080
CDN_URL: http://data:3002/cdn
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_USER: ${POSTGRES_USER}
Expand Down
Loading

0 comments on commit 69aa8bd

Please sign in to comment.