Merge pull request #51 from peter-evans/update-osrm

Update OSRM backend to version 5.19.0

Author: peter-evans

.travis.yml

@@ -2,7 +2,7 @@ services:
   - docker
 
 install:
-  - docker build -t osrm-backend-k8s ./1.17
+  - docker build -t osrm-backend-k8s ./1.18
   - docker run -d -p 5000:5000 -e OSRM_PBF_URL='http://download.geofabrik.de/asia/maldives-latest.osm.pbf' --name osrm-backend osrm-backend-k8s
 
 before_script:

1.7/Dockerfile 1.18/Dockerfile1.7/Dockerfile renamed to 1.18/Dockerfile

@@ -1,11 +1,11 @@
-FROM peterevans/xenial-gcloud:1.2.6
+FROM peterevans/xenial-gcloud:1.2.19
 
 MAINTAINER Peter Evans <[email protected]>
 
-ENV OSRM_VERSION 5.9.2
+ENV OSRM_VERSION 5.19.0
 
 # Let the container know that there is no TTY
-ENV DEBIAN_FRONTEND noninteractive
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Install packages
 RUN apt-get -y update \
@@ -24,7 +24,12 @@ RUN apt-get -y update \
     libtbb-dev \
     libluabind-dev \
     pkg-config \
+    gcc \
+    python-dev \
+    python-setuptools \    
  && apt-get clean \
+ && easy_install -U pip \
+ && pip install -U crcmod \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /tmp/* /var/tmp/*
 

1.7/docker-entrypoint.sh 1.18/docker-entrypoint.sh1.7/docker-entrypoint.sh renamed to 1.18/docker-entrypoint.sh

@@ -14,6 +14,7 @@ OSRM_PBF_URL=${OSRM_PBF_URL:="http://download.geofabrik.de/asia/maldives-latest.
 OSRM_SA_KEY_PATH=${OSRM_SA_KEY_PATH:=""}
 OSRM_PROJECT_ID=${OSRM_PROJECT_ID:=""}
 OSRM_GS_BUCKET=${OSRM_GS_BUCKET:=""}
+OSRM_MAX_TABLE_SIZE=${OSRM_MAX_TABLE_SIZE:="8000"}
 
 
 _sig() {
@@ -25,7 +26,7 @@ trap _sig SIGKILL SIGTERM SIGHUP SIGINT EXIT
 if [ "$OSRM_MODE" == "CREATE" ]; then
 
     # Retrieve the PBF file
-    curl $OSRM_PBF_URL --create-dirs -o $OSRM_DATA_PATH/$OSRM_DATA_LABEL.osm.pbf
+    curl -L $OSRM_PBF_URL --create-dirs -o $OSRM_DATA_PATH/$OSRM_DATA_LABEL.osm.pbf
 
     # Build the graph
     osrm-extract $OSRM_DATA_PATH/$OSRM_DATA_LABEL.osm.pbf -p /osrm-profiles/$OSRM_GRAPH_PROFILE.lua
@@ -60,6 +61,6 @@ else
 fi
 
 # Start serving requests
-osrm-routed $OSRM_DATA_PATH/$OSRM_DATA_LABEL.osrm --max-table-size 1000 &
+osrm-routed $OSRM_DATA_PATH/$OSRM_DATA_LABEL.osrm --max-table-size $OSRM_MAX_TABLE_SIZE &
 child=$!
 wait "$child"

1.8/Dockerfile

@@ -10,7 +10,8 @@ If you are looking for a more general purpose docker image, see [osrm-backend-do
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`1.17.1`, `1.17`, `latest`  (*1.17/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.17)
+- [`1.18.0`, `1.18`, `latest`  (*1.18/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.18)
+- [`1.17.1`, `1.17` (*1.17/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.17)
 - [`1.16.2`, `1.16` (*1.16/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.16)
 - [`1.15.7`, `1.15` (*1.15/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.15)
 - [`1.14.3`, `1.14` (*1.14/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.14)
@@ -19,7 +20,6 @@ If you are looking for a more general purpose docker image, see [osrm-backend-do
 - [`1.11.0`, `1.11` (*1.11/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.11)
 - [`1.10.0`, `1.10` (*1.10/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.10)
 - [`1.9.0`, `1.9` (*1.9/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.9)
-- [`1.8.0`, `1.8` (*1.8/Dockerfile*)](https://github.com/peter-evans/osrm-backend-k8s/tree/master/1.8)
 
 For earlier versions see [releases](https://github.com/peter-evans/osrm-backend-k8s/releases) and the available [tags on Docker Hub](https://hub.docker.com/r/peterevans/osrm-backend-k8s/tags/).