diff --git a/.gitignore b/.gitignore index 29a1a74..1ed1b30 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ celerybeat-schedule-wal *.ipynb ._* create_commits.sh + +# OSRM processed map data (large binaries, regenerated by scripts/osrm-setup.sh) +osrm-data/ diff --git a/docker-compose.yml b/docker-compose.yml index 2b631bb..1cc1e16 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,7 +60,7 @@ services: condition: service_healthy mysql: 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: - rec-network @@ -145,7 +145,7 @@ services: container_name: rec-osrm-foot command: ["osrm-routed", "--algorithm", "MLD", "/data/foot/greater-london-latest.osrm"] volumes: - - osrm_data:/data + - ./osrm-data:/data ports: - "5100:5000" networks: @@ -158,7 +158,7 @@ services: container_name: rec-osrm-bicycle command: ["osrm-routed", "--algorithm", "MLD", "/data/bicycle/greater-london-latest.osrm"] volumes: - - osrm_data:/data + - ./osrm-data:/data ports: - "5101:5000" networks: @@ -189,5 +189,4 @@ volumes: app_venv: frontend_node_modules: caddy_data: - osrm_data: otp_data: diff --git a/scripts/osrm-setup.sh b/scripts/osrm-setup.sh index d61d1ef..9fa6762 100755 --- a/scripts/osrm-setup.sh +++ b/scripts/osrm-setup.sh @@ -11,7 +11,7 @@ set -euo pipefail 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" OSRM_IMAGE="ghcr.io/project-osrm/osrm-backend:latest"