Skip to content

Commit a177aab

Browse files
authored
Merge pull request #9 from interline-io/v3.7.0
v3.7.0
2 parents f5dc0e0 + 94283c6 commit a177aab

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# ############ STAGE 1 ################
77
# #####################################
88

9-
ARG VALHALLA_VERSION=3.6.3
10-
ARG VALHALLA_COMMIT=e2f017b16080f49203de245a211b09efab09cf72
11-
ARG PRIME_SERVER_COMMIT=77e61628d78e97ce59eea6e1eeb254d1e68edcb6
9+
ARG VALHALLA_VERSION=3.7.0
10+
ARG VALHALLA_COMMIT=72f459fc5661fb906ad424be5378c4e32d9a5b3b
11+
ARG PRIME_SERVER_COMMIT=762f2ca1efc7361a4f3800322f67391c7c21aa23
1212
FROM ubuntu:24.04
1313
ARG VALHALLA_VERSION
1414
ARG VALHALLA_COMMIT
@@ -68,10 +68,9 @@ RUN mkdir -p /src && cd /src
6868
RUN git clone https://github.com/kevinkreiser/prime_server.git && (cd prime_server && git checkout ${PRIME_SERVER_COMMIT} && git submodule update --init --recursive && mkdir -p build && cd build && cmake .. && make -j2 install)
6969

7070
# valhalla
71-
# NOTE: -DENABLE_BENCHMARKS=OFF is because of https://github.com/valhalla/valhalla/issues/3200
7271
# NOTE: -ENABLE_SINGLE_FILES_WERROR=OFF because of https://github.com/valhalla/valhalla/issues/3157
7372
# NOTE: -DENABLE_TESTS=OFF to skip test builds (not needed in production image)
74-
RUN git clone https://github.com/valhalla/valhalla.git && (cd valhalla && git checkout ${VALHALLA_COMMIT} -b build && git submodule update --init --recursive && mkdir -p build && cd build && cmake .. -DCMAKE_C_COMPILER=gcc -DPKG_CONFIG_PATH=/usr/local/lib/pkgconfig -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=OFF -DENABLE_PYTHON_BINDINGS=OFF -DENABLE_BENCHMARKS=OFF -DENABLE_TESTS=OFF -DENABLE_SINGLE_FILES_WERROR=OFF && make -j2 install) && rm -rf /src
73+
RUN git clone https://github.com/valhalla/valhalla.git && (cd valhalla && git checkout ${VALHALLA_COMMIT} -b build && git submodule update --init --recursive && mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=OFF -DENABLE_PYTHON_BINDINGS=OFF -DENABLE_TESTS=OFF -DENABLE_SINGLE_FILES_WERROR=OFF && make -j$(nproc) install) && rm -rf /src
7574

7675
# #####################################
7776
# ############ STAGE 2 ################

0 commit comments

Comments
 (0)