From 6af3060bed8b768902ffcf70946c303004ffc889 Mon Sep 17 00:00:00 2001 From: JC Casas Date: Wed, 15 Mar 2017 03:29:27 -0500 Subject: [PATCH 1/6] Upgrade OSRM-Backend version to v5.6.0 --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ce4cce..399e391 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,9 +29,9 @@ RUN mkdir -p /osrm-build \ WORKDIR /osrm-build -RUN curl --silent -L https://github.com/Project-OSRM/osrm-backend/archive/v5.2.6.tar.gz -o v5.2.6.tar.gz \ - && tar xzf v5.2.6.tar.gz \ - && mv osrm-backend-5.2.6 /osrm-src \ +RUN curl --silent -L https://github.com/Project-OSRM/osrm-backend/archive/v5.6.0.tar.gz -o v5.6.0.tar.gz \ + && tar xzf v5.6.0.tar.gz \ + && mv osrm-backend-5.6.0 /osrm-src \ && cmake /osrm-src \ && make \ && mv /osrm-src/profiles/car.lua profile.lua \ @@ -42,7 +42,8 @@ RUN curl --silent -L https://github.com/Project-OSRM/osrm-backend/archive/v5.2.6 # Cleanup -------------------------------- RUN apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && rm -f v5.6.0.tar.gz # Publish -------------------------------- From 5a745e8768d7af5eae6cf86980aa6f96ac378aa2 Mon Sep 17 00:00:00 2001 From: JC Casas Date: Wed, 15 Mar 2017 04:18:11 -0500 Subject: [PATCH 2/6] Added GCC-4.9 dependency --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 399e391..5446ff9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,10 @@ MAINTAINER Alex Newman ENV DEBIAN_FRONTEND noninteractive # Install necessary packages for proper system state +RUN add-apt-repository ppa:ubuntu-toolchain-r/test RUN apt-get -y update && apt-get install -y \ build-essential \ + g++-4.9 \ cmake \ curl \ git \ From e9d10b8facc432aff97fe65ed9a32e004b7b555e Mon Sep 17 00:00:00 2001 From: JC Casas Date: Wed, 15 Mar 2017 04:24:24 -0500 Subject: [PATCH 3/6] added software-properties-common in order to use ppa --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5446ff9..0225d66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,8 @@ MAINTAINER Alex Newman ENV DEBIAN_FRONTEND noninteractive # Install necessary packages for proper system state -RUN add-apt-repository ppa:ubuntu-toolchain-r/test RUN apt-get -y update && apt-get install -y \ build-essential \ - g++-4.9 \ cmake \ curl \ git \ @@ -24,7 +22,11 @@ RUN apt-get -y update && apt-get install -y \ liblua5.1-0-dev \ libluabind-dev \ libluajit-5.1-dev \ - pkg-config + pkg-config \ + software-properties-common + +RUN add-apt-repository ppa:ubuntu-toolchain-r/test +RUN apt-get -y update && apt-get install -y g++-4.9 RUN mkdir -p /osrm-build \ && mkdir -p /osrm-data From f821b97ebd36c229605d09fa8d6fb2fe2c482b6b Mon Sep 17 00:00:00 2001 From: JC Casas Date: Wed, 15 Mar 2017 10:12:25 +0000 Subject: [PATCH 4/6] xenial image; updated dependencies --- Dockerfile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0225d66..c795795 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:trusty +FROM ubuntu:xenial MAINTAINER Alex Newman # Let the container know that there is no TTY @@ -13,20 +13,13 @@ RUN apt-get -y update && apt-get install -y \ libboost-all-dev \ libbz2-dev \ libstxxl-dev \ - libstxxl-doc \ - libstxxl1 \ + libstxxl1v5 \ libtbb-dev \ libxml2-dev \ libzip-dev \ - lua5.1 \ - liblua5.1-0-dev \ - libluabind-dev \ - libluajit-5.1-dev \ - pkg-config \ - software-properties-common - -RUN add-apt-repository ppa:ubuntu-toolchain-r/test -RUN apt-get -y update && apt-get install -y g++-4.9 + lua5.2 \ + liblua5.2-dev \ + pkg-config RUN mkdir -p /osrm-build \ && mkdir -p /osrm-data From f469b3f6c70499cdaeadaf05c2761da344c88645 Mon Sep 17 00:00:00 2001 From: JC Casas Date: Thu, 23 Mar 2017 22:38:23 -0500 Subject: [PATCH 5/6] fixed location of the lua profile in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c795795..494890f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN curl --silent -L https://github.com/Project-OSRM/osrm-backend/archive/v5.6.0 && mv osrm-backend-5.6.0 /osrm-src \ && cmake /osrm-src \ && make \ - && mv /osrm-src/profiles/car.lua profile.lua \ + && mv /osrm-src/profiles/car.lua profiles/car.lua \ && mv /osrm-src/profiles/lib/ lib \ && echo "disk=/tmp/stxxl,25000,syscall" > .stxxl \ && rm -rf /osrm-src From 1b275edc7b4b1db970243437237fa4e158d41eeb Mon Sep 17 00:00:00 2001 From: JC Casas Date: Thu, 23 Mar 2017 22:40:16 -0500 Subject: [PATCH 6/6] Update Dockerfile --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 494890f..3e586b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,8 +31,7 @@ RUN curl --silent -L https://github.com/Project-OSRM/osrm-backend/archive/v5.6.0 && mv osrm-backend-5.6.0 /osrm-src \ && cmake /osrm-src \ && make \ - && mv /osrm-src/profiles/car.lua profiles/car.lua \ - && mv /osrm-src/profiles/lib/ lib \ + && mv /osrm-src/profiles profiles \ && echo "disk=/tmp/stxxl,25000,syscall" > .stxxl \ && rm -rf /osrm-src