Skip to content

Commit

Permalink
Valhalla 3.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
drewda committed Aug 19, 2021
1 parent 6ca059f commit 61d232c
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# ############ STAGE 1 ################
# #####################################

ARG VALHALLA_VERSION=3.1.0
ARG VALHALLA_VERSION=3.1.3
ARG VALHALLA_REPO=https://github.com/valhalla/valhalla.git
ARG PRIME_SERVER_TAG=0.7.0
FROM ubuntu:18.04
Expand All @@ -21,7 +21,6 @@ RUN apt-get update && apt-get install -y \
autoconf \
automake \
build-essential \
cmake \
curl \
g++ \
gcc \
Expand All @@ -36,6 +35,7 @@ RUN apt-get update && apt-get install -y \
libexpat1-dev \
libgeos++-dev \
libgeos-dev \
libidn11 \
libluajit-5.1-dev \
liblz4-dev \
libspatialite-dev \
Expand All @@ -60,13 +60,18 @@ RUN apt-get update && apt-get install -y \
wget \
zlib1g-dev

# install a more recent cmake than available through apt-get for Ubuntu 18.04
RUN curl -sSL https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-linux-x86_64.tar.gz | tar -xzC /opt
ENV PATH="/opt/cmake-3.21.1-linux-x86_64/bin/:${PATH}"

RUN mkdir -p /src && cd /src

# prime_server
RUN git clone -v --branch ${PRIME_SERVER_TAG} https://github.com/kevinkreiser/prime_server.git && (cd prime_server && git submodule update --init --recursive && mkdir -p build && cd build && cmake .. && make -j2 install)

# valhalla
RUN git clone https://github.com/valhalla/valhalla.git && (cd valhalla && git checkout tags/${VALHALLA_VERSION} -b build && git submodule update --init --recursive && mkdir -p build && cd build && cmake .. -DPKG_CONFIG_PATH=/usr/local/lib/pkgconfig -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=OFF && make -j2 install) && rm -rf /src
# NOTE: -DENABLE_BENCHMARKS=OFF is because of https://github.com/valhalla/valhalla/issues/3200
RUN git clone https://github.com/valhalla/valhalla.git && (cd valhalla && git checkout tags/${VALHALLA_VERSION} -b build && git submodule update --init --recursive && mkdir -p build && cd build && cmake .. -DPKG_CONFIG_PATH=/usr/local/lib/pkgconfig -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=OFF -DENABLE_BENCHMARKS=OFF && make -j2 install) && rm -rf /src

# #####################################
# ############ STAGE 2 ################
Expand All @@ -85,12 +90,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y apt-transport-h

# Install apt packages packages
RUN apt-get update && apt-get install --no-install-recommends -y \
libboost-python1.65.1 \
libboost-filesystem1.65.1 \
libboost-iostreams1.65.1 \
libboost-regex1.65.1 \
libboost-thread1.65.1 \
libboost-program-options1.65.1 \
libboost-python1.62 \
libboost-filesystem1.62 \
libboost-iostreams1.62 \
libboost-regex1.62 \
libboost-thread1.62 \
libboost-program-options1.62 \
libluajit-5.1-2 \
libprotoc10 \
libprotobuf-lite10 \
Expand Down

0 comments on commit 61d232c

Please sign in to comment.