From 15a037f988e720d946e6749b55084488e9b98b75 Mon Sep 17 00:00:00 2001
From: Daniel Gollings <daniel@keana.io>
Date: Tue, 15 Feb 2022 22:12:16 +0100
Subject: [PATCH 1/4] updated OSRM_VERSION

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8ac900d..8a900e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ LABEL \
   org.opencontainers.image.vendor="https://peterevans.dev" \
   org.opencontainers.image.licenses="MIT"
 
-ENV OSRM_VERSION 5.22.0
+ENV OSRM_VERSION 5.26.0
 
 # Let the container know that there is no TTY
 ARG DEBIAN_FRONTEND=noninteractive

From 10ee3c659b6fa22fcf112e8abdd2326dda83ee9a Mon Sep 17 00:00:00 2001
From: Daniel Gollings <daniel@keana.io>
Date: Tue, 15 Feb 2022 22:12:34 +0100
Subject: [PATCH 2/4] easy_install pip cant be found, using repo version

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8a900e3..113d14b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,9 +33,9 @@ RUN apt-get -y update \
     pkg-config \
     gcc \
     python-dev \
+    python-pip \
     python-setuptools \    
  && apt-get clean \
- && easy_install -U pip \
  && pip install -U crcmod \
  && rm -rf /var/lib/apt/lists/* \
  && rm -rf /tmp/* /var/tmp/*

From 670a273abc732c07acf8b29ea9d28773c544f990 Mon Sep 17 00:00:00 2001
From: Daniel Gollings <daniel@keana.io>
Date: Tue, 15 Feb 2022 22:13:00 +0100
Subject: [PATCH 3/4] old LetsEncrypt root cert (my theory), ignore ssl cert
 errors

---
 docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 5632ae7..71c0e82 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -26,7 +26,7 @@ trap _sig SIGKILL SIGTERM SIGHUP SIGINT EXIT
 if [ "$OSRM_MODE" == "CREATE" ]; then
     
     # Retrieve the PBF file
-    curl -L $OSRM_PBF_URL --create-dirs -o $OSRM_DATA_PATH/$OSRM_DATA_LABEL.osm.pbf
+    curl -k -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

From 480138f59fdfbd31b6707a35e6e075ac40bd132a Mon Sep 17 00:00:00 2001
From: Daniel Gollings <daniel@keana.io>
Date: Fri, 11 Mar 2022 17:30:04 +0100
Subject: [PATCH 4/4] added support for prebuilt osrm files in Docker images

---
 Dockerfile           | 4 ++++
 docker-entrypoint.sh | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 113d14b..3abb2f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,6 +56,10 @@ RUN mkdir /osrm-src \
  && cp -r /osrm-src/osrm-backend-$OSRM_VERSION/profiles/* /osrm-profiles \
  && rm -rf /osrm-src
 
+# allows for adding prebuilt files to the image for faster use in dev without egress charges
+# expects data in same format as on gs, so prebuilt/$OSRM_DATA_LABEL/*.osrm*
+COPY prebuilt/ /prebuilt/
+
 # Set the entrypoint
 COPY docker-entrypoint.sh /
 RUN chmod +x /docker-entrypoint.sh
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 71c0e82..c93ecc8 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -45,8 +45,13 @@ if [ "$OSRM_MODE" == "CREATE" ]; then
     fi
     
 else
-
-    if [ ! -z "$OSRM_SA_KEY_PATH" ] && [ ! -z "$OSRM_PROJECT_ID" ] && [ ! -z "$OSRM_GS_BUCKET" ]; then
+    if  [ -d /prebuilt ] && [ -d /prebuilt/$OSRM_DATA_LABEL ] ; then 
+        cd $OSRM_DATA_PATH || exit
+        for i in /prebuilt/"$OSRM_DATA_LABEL"/*; do
+            echo ln -s "$i"
+            ln -s "$i" .
+        done
+    elif [ -n "$OSRM_SA_KEY_PATH" ] && [ -n "$OSRM_PROJECT_ID" ] && [ -n "$OSRM_GS_BUCKET" ]; then
 
         # Activate the service account to access storage
         gcloud auth activate-service-account --key-file $OSRM_SA_KEY_PATH