Fix OSRM setup: update Geofabrik URL and use bind mount for data

- Update Geofabrik download URL from great-britain to united-kingdom
  (old path returns 302 redirect to homepage).
- Switch OSRM Docker volumes from named volume to bind mount
  (./osrm-data:/data) so osrm-setup.sh output is used directly.
- Add osrm-data/ to .gitignore (large binaries, regenerated by script).
This commit is contained in:
Viktor Barzin 2026-02-08 14:51:52 +00:00
parent 2fdafdcb64
commit 01dae5dfbd
No known key found for this signature in database
GPG key ID: 0EB088298288D958
3 changed files with 7 additions and 5 deletions

3
.gitignore vendored
View file

@ -20,3 +20,6 @@ celerybeat-schedule-wal
*.ipynb *.ipynb
._* ._*
create_commits.sh create_commits.sh
# OSRM processed map data (large binaries, regenerated by scripts/osrm-setup.sh)
osrm-data/

View file

@ -60,7 +60,7 @@ services:
condition: service_healthy condition: service_healthy
mysql: mysql:
condition: service_healthy condition: service_healthy
command: ["uvicorn", "api.app:app", "--host", "0.0.0.0", "--port", "5001", "--reload", "--reload-dir", "api", "--reload-dir", "services", "--reload-dir", "repositories", "--reload-dir", "models"] command: ["sh", "-c", "alembic upgrade head && uvicorn api.app:app --host 0.0.0.0 --port 5001 --reload --reload-dir api --reload-dir services --reload-dir repositories --reload-dir models"]
networks: networks:
- rec-network - rec-network
@ -145,7 +145,7 @@ services:
container_name: rec-osrm-foot container_name: rec-osrm-foot
command: ["osrm-routed", "--algorithm", "MLD", "/data/foot/greater-london-latest.osrm"] command: ["osrm-routed", "--algorithm", "MLD", "/data/foot/greater-london-latest.osrm"]
volumes: volumes:
- osrm_data:/data - ./osrm-data:/data
ports: ports:
- "5100:5000" - "5100:5000"
networks: networks:
@ -158,7 +158,7 @@ services:
container_name: rec-osrm-bicycle container_name: rec-osrm-bicycle
command: ["osrm-routed", "--algorithm", "MLD", "/data/bicycle/greater-london-latest.osrm"] command: ["osrm-routed", "--algorithm", "MLD", "/data/bicycle/greater-london-latest.osrm"]
volumes: volumes:
- osrm_data:/data - ./osrm-data:/data
ports: ports:
- "5101:5000" - "5101:5000"
networks: networks:
@ -189,5 +189,4 @@ volumes:
app_venv: app_venv:
frontend_node_modules: frontend_node_modules:
caddy_data: caddy_data:
osrm_data:
otp_data: otp_data:

View file

@ -11,7 +11,7 @@
set -euo pipefail set -euo pipefail
DATA_DIR="${1:-./osrm-data}" DATA_DIR="${1:-./osrm-data}"
GEOFABRIK_URL="https://download.geofabrik.de/europe/great-britain/england/greater-london-latest.osm.pbf" GEOFABRIK_URL="https://download.geofabrik.de/europe/united-kingdom/england/greater-london-latest.osm.pbf"
OSM_FILE="greater-london-latest.osm.pbf" OSM_FILE="greater-london-latest.osm.pbf"
OSRM_IMAGE="ghcr.io/project-osrm/osrm-backend:latest" OSRM_IMAGE="ghcr.io/project-osrm/osrm-backend:latest"