Skip to content

Commit 667fd19

Browse files
Use the latest Debian version in Dockerfile (#6904)
1 parent b7a990d commit 667fd19

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ jobs:
456456
fi
457457
458458
# TBB
459-
TBB_VERSION=2021.3.0
459+
TBB_VERSION=2021.12.0
460460
if [[ "${RUNNER_OS}" == "Linux" ]]; then
461461
TBB_URL="https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/oneapi-tbb-${TBB_VERSION}-lin.tgz"
462462
elif [[ "${RUNNER_OS}" == "macOS" ]]; then

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- ADDED: Add support for opposite approach request parameter. [#6842](https://github.com/Project-OSRM/osrm-backend/pull/6842)
88
- ADDED: Add support for accessing edge flags in `process_segment` [#6658](https://github.com/Project-OSRM/osrm-backend/pull/6658)
99
- Build:
10+
- CHANGED: Use Debian Bookworm as base Docker image [#6904](https://github.com/Project-OSRM/osrm-backend/pull/6904)
1011
- CHANGED: Upgrade CI actions to latest versions [#6893](https://github.com/Project-OSRM/osrm-backend/pull/6893)
1112
- CHANGED: Remove outdated warnings #6894 [#6894](https://github.com/Project-OSRM/osrm-backend/pull/6894)
1213
- ADDED: Add CI job which builds OSRM with gcc 12. [#6455](https://github.com/Project-OSRM/osrm-backend/pull/6455)

docker/Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
FROM debian:bullseye-slim as builder
1+
FROM debian:bookworm-slim as builder
22
ARG DOCKER_TAG
33
ARG BUILD_CONCURRENCY
44
RUN mkdir -p /src && mkdir -p /opt
55

66
RUN apt-get update && \
77
apt-get -y --no-install-recommends install ca-certificates cmake make git gcc g++ libbz2-dev libxml2-dev wget \
8-
libzip-dev libboost1.74-all-dev lua5.4 liblua5.4-dev pkg-config -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
8+
libzip-dev libboost1.81-all-dev lua5.4 liblua5.4-dev pkg-config -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
99

1010
RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
1111
ldconfig /usr/local/lib && \
12-
git clone --branch v2021.3.0 --single-branch https://github.com/oneapi-src/oneTBB.git && \
12+
git clone --branch v2021.12.0 --single-branch https://github.com/oneapi-src/oneTBB.git && \
1313
cd oneTBB && \
1414
mkdir build && \
1515
cd build && \
@@ -21,6 +21,7 @@ COPY . /src
2121
WORKDIR /src
2222

2323
RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
24+
export CXXFLAGS="-Wno-array-bounds -Wno-uninitialized" && \
2425
echo "Building OSRM ${DOCKER_TAG}" && \
2526
git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
2627
echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
@@ -42,15 +43,15 @@ RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
4243

4344
# Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
4445
# Only the content below ends up in the image, this helps remove /src from the image (which is large)
45-
FROM debian:bullseye-slim as runstage
46+
FROM debian:bookworm-slim as runstage
4647

4748
COPY --from=builder /usr/local /usr/local
4849
COPY --from=builder /opt /opt
4950

5051
RUN apt-get update && \
51-
apt-get install -y --no-install-recommends libboost-program-options1.74.0 libboost-regex1.74.0 \
52-
libboost-date-time1.74.0 libboost-chrono1.74.0 libboost-filesystem1.74.0 \
53-
libboost-iostreams1.74.0 libboost-system1.74.0 libboost-thread1.74.0 \
52+
apt-get install -y --no-install-recommends libboost-program-options1.81.0 libboost-regex1.81.0 \
53+
libboost-date-time1.81.0 libboost-chrono1.81.0 libboost-filesystem1.81.0 \
54+
libboost-iostreams1.81.0 libboost-system1.81.0 libboost-thread1.81.0 \
5455
expat liblua5.4-0 && \
5556
rm -rf /var/lib/apt/lists/* && \
5657
# add /usr/local/lib to ldconfig to allow loading libraries from there

0 commit comments

Comments
 (0)