Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Migrate to modern TBB version

Browse Source
This commit is contained in:
Siarhei Fedartsou 2022-08-19 23:36:19 +02:00
parent 57a2293365
commit 2b316f0197
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/Dockerfile
View File

@ -7,17 +7,19 @@ RUN apt-get update && \
apt-get -y --no-install-recommends install ca-certificates cmake make git gcc g++ libbz2-dev libxml2-dev wget \ apt-get -y --no-install-recommends install ca-certificates cmake make git gcc g++ libbz2-dev libxml2-dev wget \
libzip-dev libboost1.74-all-dev lua5.2 liblua5.2-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0 libzip-dev libboost1.74-all-dev lua5.2 liblua5.2-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
RUN export TBB_VERSION=2021.3.0 && \ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
export TBB_URL="https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/oneapi-tbb-${TBB_VERSION}-lin.tgz" && \ git clone --branch v2021.3.0 --single-branch https://github.com/oneapi-src/oneTBB.git && \
wget --tries 5 ${TBB_URL} -O onetbb.tgz && \ cd oneTBB && \
tar zxvf onetbb.tgz && \ mkdir build && \
cp -a oneapi-tbb-${TBB_VERSION}/lib/. /usr/local/lib/ && \ cd build && \
cp -a oneapi-tbb-${TBB_VERSION}/include/. /usr/local/include/ cmake .. && \
make -j${NPROC} && \
make install
COPY . /src COPY . /src
WORKDIR /src WORKDIR /src
RUN NPROC=${BUILD_CONCURRENCY:-$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)} && \ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
echo "Building OSRM ${DOCKER_TAG}" && \ echo "Building OSRM ${DOCKER_TAG}" && \
git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \ git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \ echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
@ -53,6 +55,7 @@ RUN /usr/local/bin/osrm-extract --help && \
/usr/local/bin/osrm-contract --help && \ /usr/local/bin/osrm-contract --help && \
/usr/local/bin/osrm-partition --help && \ /usr/local/bin/osrm-partition --help && \
/usr/local/bin/osrm-customize --help /usr/local/bin/osrm-customize --help
WORKDIR /opt WORKDIR /opt
EXPOSE 5000 EXPOSE 5000