Skip to content

Commit c9813ec

Browse files
PietfriedPietfried
committed
Updated docker base image to debian13 and updated respective dependencies
Signed-off-by: Piet Gömpel <[email protected]>
1 parent 64f0238 commit c9813ec

File tree

3 files changed

+128
-127
lines changed

3 files changed

+128
-127
lines changed

‎docker/images/build-env-base/Dockerfile‎

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,42 @@
11
# syntax=docker/dockerfile:1
22
ARG BASE_IMAGE_TAG=latest
33
FROM ghcr.io/everest/everest-ci/run-env-base:${BASE_IMAGE_TAG}
4+
ARG TARGETARCH
45

5-
# renovate: datasource=repology depName=debian_12/git versioning=loose
6-
ENV GIT_VERSION=1:2.39.5-0+deb12u2
7-
# renovate: datasource=repology depName=debian_12/curl versioning=loose
8-
ENV CURL_VERSION=7.88.1-10+deb12u12
9-
# renovate: datasource=repology depName=debian_12/rsync versioning=loose
10-
ENV RSYNC_VERSION=3.2.7-1+deb12u2
11-
# renovate: datasource=repology depName=debian_12/ninja-build versioning=loose
12-
ENV NINJA_BUILD_VERSION=1.11.1-2~deb12u1
13-
# renovate: datasource=repology depName=debian_12/make-dfsg versioning=loose
14-
ENV MAKE_VERSION=4.3-4.1
15-
# renovate: datasource=repology depName=debian_12/cmake versioning=loose
16-
ENV CMAKE_VERSION=3.25.1-1
17-
# renovate: datasource=repology depName=debian_12/binutils versioning=loose
18-
ENV BINUTILS_VERSION=2.40-2
19-
# renovate: datasource=repology depName=debian_12/gcc versioning=loose
20-
ENV GCC_VERSION=4:12.2.0-3
21-
# renovate: datasource=repology depName=debian_12/g++ versioning=loose
22-
ENV GPP_VERSION=4:12.2.0-3
23-
# renovate: datasource=repology depName=debian_12/ccache versioning=loose
24-
ENV CCACHE_VERSION=4.8+really4.7.5-1
25-
# renovate: datasource=repology depName=debian_12/lcov versioning=loose
26-
ENV LCOV_VERSION=1.16-1
27-
# renovate: datasource=repology depName=debian_12/clang-format versioning=loose
28-
ENV CLANG_FORMAT_VERSION=1:15.0.6-4+b1
29-
# renovate: datasource=repology depName=debian_12/clang-tidy versioning=loose
30-
ENV CLANG_TIDY_VERSION=1:15.0.6-4+b1
31-
# renovate: datasource=repology depName=debian_12/doxygen versioning=loose
32-
ENV DOXYGEN_VERSION=1.9.4-4
6+
# renovate: datasource=repology depName=debian_13/git versioning=loose
7+
ENV GIT_VERSION=1:2.47.3-0+deb13u1
8+
# renovate: datasource=repology depName=debian_13/curl versioning=loose
9+
ENV CURL_VERSION=8.14.1-2
10+
# renovate: datasource=repology depName=debian_13/rsync versioning=loose
11+
ENV RSYNC_VERSION=3.4.1+ds1-5
12+
# renovate: datasource=repology depName=debian_13/ninja-build versioning=loose
13+
ENV NINJA_BUILD_VERSION=1.12.1-1
14+
# renovate: datasource=repology depName=debian_13/make-dfsg versioning=loose
15+
ENV MAKE_VERSION=4.4.1-2
16+
# renovate: datasource=repology depName=debian_13/cmake versioning=loose
17+
ENV CMAKE_VERSION=3.31.6-2
18+
# renovate: datasource=repology depName=debian_13/binutils versioning=loose
19+
ENV BINUTILS_VERSION=2.44-3
20+
# renovate: datasource=repology depName=debian_13/gcc versioning=loose
21+
ENV GCC_VERSION=4:14.2.0-1
22+
# renovate: datasource=repology depName=debian_13/g++ versioning=loose
23+
ENV GPP_VERSION=4:14.2.0-1
24+
# renovate: datasource=repology depName=debian_13/ccache versioning=loose
25+
ENV CCACHE_VERSION=4.11.2-2
26+
# renovate: datasource=repology depName=debian_13/lcov versioning=loose
27+
ENV LCOV_VERSION=2.3.1-1
28+
# renovate: datasource=repology depName=debian_13/clang-format versioning=loose
29+
ENV CLANG_FORMAT_VERSION=1:19.0-63
30+
# renovate: datasource=repology depName=debian_13/clang-tidy versioning=loose
31+
ENV CLANG_TIDY_VERSION=1:19.0-63
32+
# renovate: datasource=repology depName=debian_13/doxygen versioning=loose
33+
ENV DOXYGEN_VERSION=1.9.8+ds-2.1
3334

34-
RUN apt update \
35+
# ARM64 overrides
36+
RUN if [ "$TARGETARCH" = "arm64" ]; then \
37+
NINJA_BUILD_VERSION=1.12.1-1+b1; \
38+
fi && \
39+
apt update \
3540
&& apt install --no-install-recommends -y \
3641
# basic command line tools
3742
git=${GIT_VERSION} \
@@ -48,37 +53,33 @@ RUN apt update \
4853
# compiler tools
4954
ccache=${CCACHE_VERSION} \
5055
lcov=${LCOV_VERSION} \
51-
clang-format-15=${CLANG_FORMAT_VERSION} \
52-
clang-tidy-15=${CLANG_TIDY_VERSION} \
56+
clang-format=${CLANG_FORMAT_VERSION} \
57+
clang-tidy=${CLANG_TIDY_VERSION} \
5358
# documentation
5459
doxygen=${DOXYGEN_VERSION}
5560

56-
# Create symlinks for clang-format and clang-tidy
57-
RUN ln -s /usr/bin/clang-format-15 /usr/bin/clang-format \
58-
&& ln -s /usr/bin/clang-tidy-15 /usr/bin/clang-tidy
59-
6061
COPY run-clang-format.py /usr/bin/run-clang-format
6162

62-
# renovate: datasource=repology depName=debian_12/boost-defaults versioning=loose
63-
ENV LIBBOOST_ALL_DEV_VERSION=1.74.0.3
64-
# renovate: datasource=repology depName=debian_12/libsqlite3-dev versioning=loose
65-
ENV LIBSQLITE3_DEV_VERSION=3.40.1-2+deb12u1
66-
# renovate: datasource=repology depName=debian_12/openssl versioning=loose
67-
ENV LIBSSL_DEV_VERSION=3.0.17-1~deb12u1
68-
# renovate: datasource=repology depName=debian_12/nodejs versioning=loose
69-
ENV LIBNODE_DEV_VERSION=18.19.0+dfsg-6~deb12u2
70-
# renovate: datasource=repology depName=debian_12/pkg-config versioning=loose
71-
ENV PKG_CONFIG_VERSION=1.8.1-1
72-
# renovate: datasource=repology depName=debian_12/libpcap-dev versioning=loose
73-
ENV LIBPCAP_DEV_VERSION=1.10.3-1
74-
# renovate: datasource=repology depName=debian_12/libcap versioning=loose
75-
ENV LIBCAP_DEV_VERSION=1:2.66-4+deb12u1
76-
# renovate: datasource=repology depName=debian_12/python3-venv versioning=loose
77-
ENV PYTHON3_VENV_VERSION=3.11.2-1+b1
78-
# renovate: datasource=repology depName=debian_12/python3-build versioning=loose
79-
ENV PYTHON3_BUILD_VERSION=0.9.0-1
80-
# renovate: datasource=repology depName=debian_12/sphinx versioning=loose
81-
ENV PYTHON3_SPHINX_VERSION=5.3.0-4
63+
# renovate: datasource=repology depName=debian_13/boost-defaults versioning=loose
64+
ENV LIBBOOST_ALL_DEV_VERSION=1.83.0.2+b2
65+
# renovate: datasource=repology depName=debian_13/libsqlite3-dev versioning=loose
66+
ENV LIBSQLITE3_DEV_VERSION=3.46.1-7
67+
# renovate: datasource=repology depName=debian_13/openssl versioning=loose
68+
ENV LIBSSL_DEV_VERSION=3.5.1-1
69+
# renovate: datasource=repology depName=debian_13/nodejs versioning=loose
70+
ENV LIBNODE_DEV_VERSION=20.19.2+dfsg-1
71+
# renovate: datasource=repology depName=debian_13/pkg-config versioning=loose
72+
ENV PKG_CONFIG_VERSION=1.8.1-4
73+
# renovate: datasource=repology depName=debian_13/libpcap-dev versioning=loose
74+
ENV LIBPCAP_DEV_VERSION=1.10.5-2
75+
# renovate: datasource=repology depName=debian_13/libcap versioning=loose
76+
ENV LIBCAP_DEV_VERSION=1:2.75-10+b1
77+
# renovate: datasource=repology depName=debian_13/python3-venv versioning=loose
78+
ENV PYTHON3_VENV_VERSION=3.13.5-1
79+
# renovate: datasource=repology depName=debian_13/python3-build versioning=loose
80+
ENV PYTHON3_BUILD_VERSION=1.2.2-2
81+
# renovate: datasource=repology depName=debian_13/sphinx versioning=loose
82+
ENV PYTHON3_SPHINX_VERSION=8.1.3-5
8283

8384
# additional packages
8485
RUN apt update \
@@ -106,7 +107,7 @@ RUN apt clean \
106107
&& rm -rf /var/lib/apt/lists/*
107108

108109
# renovate: datasource=pypi depName=gcovr
109-
ENV GCOVR_VERSION=8.2
110+
ENV GCOVR_VERSION=8.3
110111
# renovate: datasource=pypi depName=sphinxcontrib-contentui
111112
ENV SPHINXCONTRIB_CONTENTUI_VERSION=0.2.5
112113
# renovate: datasource=pypi depName=sphinxcontrib-svg2pdfconverter

‎docker/images/dev-env-base/Dockerfile‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ RUN apt update \
1515
&& echo ${USERNAME} ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/${USERNAME} \
1616
&& chmod 0440 /etc/sudoers.d/${USERNAME}
1717

18-
# renovate: datasource=repology depName=debian_12/wget versioning=loose
19-
ENV WGET_VERSION=1.21.3-1+deb12u1
20-
# renovate: datasource=repology depName=debian_12/doxygen versioning=loose
21-
ENV DOXYGEN_VERSION=1.9.4-4
22-
# renovate: datasource=repology depName=debian_12/graphviz versioning=loose
23-
ENV GRAPHVIZ_VERSION=2.42.2-7+deb12u1
24-
# renovate: datasource=repology depName=debian_12/build-essential-mipsen versioning=loose
25-
ENV BUILD_ESSENTIAL_VERSION=12.9
26-
# renovate: datasource=repology depName=debian_12/cppcheck versioning=loose
27-
ENV CPPCHECK_VERSION=2.10-2
28-
# renovate: datasource=repology depName=debian_12/bash-completion versioning=loose
29-
ENV BASH_COMPLETION_VERSION=1:2.11-6
30-
# renovate: datasource=repology depName=debian_12/vim versioning=loose
31-
ENV VIM_VERSION=2:9.0.1378-2+deb12u2
32-
# renovate: datasource=repology depName=debian_12/gdb versioning=loose
33-
ENV GDB_VERSION=13.1-3
34-
# renovate: datasource=repology depName=debian_12/nmap versioning=loose
35-
ENV NMAP_VERSION=7.93+dfsg1-1
18+
# renovate: datasource=repology depName=debian_13/wget versioning=loose
19+
ENV WGET_VERSION=1.25.0-2
20+
# renovate: datasource=repology depName=debian_13/doxygen versioning=loose
21+
ENV DOXYGEN_VERSION=1.9.8+ds-2.1
22+
# renovate: datasource=repology depName=debian_13/graphviz versioning=loose
23+
ENV GRAPHVIZ_VERSION=2.42.4-3
24+
# renovate: datasource=repology depName=debian_13/build-essential-mipsen versioning=loose
25+
ENV BUILD_ESSENTIAL_VERSION=12.12
26+
# renovate: datasource=repology depName=debian_13/cppcheck versioning=loose
27+
ENV CPPCHECK_VERSION=2.17.1-2
28+
# renovate: datasource=repology depName=debian_13/bash-completion versioning=loose
29+
ENV BASH_COMPLETION_VERSION=1:2.16.0-7
30+
# renovate: datasource=repology depName=debian_13/vim versioning=loose
31+
ENV VIM_VERSION=2:9.1.1230-2
32+
# renovate: datasource=repology depName=debian_13/gdb versioning=loose
33+
ENV GDB_VERSION=16.3-1
34+
# renovate: datasource=repology depName=debian_13/nmap versioning=loose
35+
ENV NMAP_VERSION=7.95+dfsg-3
3636

3737
# Development Tools
3838
# Development Tools - General
@@ -61,17 +61,17 @@ RUN python3 -m pip install --break-system-packages \
6161
# Style checker for RST/Sphinx
6262
doc8==${DOC8_VERSION}
6363

64-
# renovate: datasource=repology depName=debian_12/ca-certificates versioning=loose
65-
ENV CA_CERTIFICATES_VERSION=20230311+deb12u1
66-
# renovate: datasource=repology depName=debian_12/curl versioning=loose
67-
ENV CURL_VERSION=7.88.1-10+deb12u12
64+
# renovate: datasource=repology depName=debian_13/ca-certificates versioning=loose
65+
ENV CA_CERTIFICATES_VERSION=20250419
66+
# renovate: datasource=repology depName=debian_13/curl versioning=loose
67+
ENV CURL_VERSION=8.14.1-2
6868

6969
# Not managed by renovate, because no available datasource
70-
ENV DOCKER_CE_VERSION=5:27.0.3-1~debian.12~bookworm
71-
ENV DOCKER_CE_CLI_VERSION=5:27.1.1-1~debian.12~bookworm
72-
ENV CONTAINERD_IO_VERSION=1.7.19-1
73-
ENV DOCKER_BUILDX_PLUGIN_VERSION=0.16.1-1~debian.12~bookworm
74-
ENV DOCKER_COMPOSE_PLUGIN_VERSION=2.29.1-1~debian.12~bookworm
70+
ENV DOCKER_CE_VERSION=5:28.1.0-1~debian.13~trixie
71+
ENV DOCKER_CE_CLI_VERSION=5:28.1.0-1~debian.13~trixie
72+
ENV CONTAINERD_IO_VERSION=1.7.27-1
73+
ENV DOCKER_BUILDX_PLUGIN_VERSION=0.22.0-1~debian.13~trixie
74+
ENV DOCKER_COMPOSE_PLUGIN_VERSION=2.35.0-1~debian.13~trixie
7575

7676
# Development Tools - Docker
7777
RUN apt update \

‎docker/images/run-env-base/Dockerfile‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
# syntax=docker/dockerfile:1
2-
FROM debian:12-slim
2+
FROM debian:13-slim
33

4-
# renovate: datasource=repology depName=debian_12/openjdk-17 versioning=loose
5-
ENV OPENJDK_17_JRE_VERSION=17.0.15+6-1~deb12u1
6-
# renovate: datasource=repology depName=debian_12/nodejs versioning=loose
7-
ENV NODEJS_VERSION=18.19.0+dfsg-6~deb12u2
8-
# renovate: datasource=repology depName=debian_12/npm versioning=loose
9-
ENV NPM_VERSION=9.2.0~ds1-1
10-
# renovate: datasource=repology depName=debian_12/python3-pip versioning=loose
11-
ENV PYTHON3_PIP_VERSION=23.0.1+dfsg-1
12-
# renovate: datasource=repology depName=debian_12/sqlite3 versioning=loose
13-
ENV SQLITE3_VERSION=3.40.1-2+deb12u1
14-
# renovate: datasource=repology depName=debian_12/boost1.74 versioning=loose
15-
ENV LIBBOOST_PROGRAM_OPTIONS1_74_0_VERSION=1.74.0+ds1-21
16-
# renovate: datasource=repology depName=debian_12/boost1.74 versioning=loose
17-
ENV LIBBOOST_LOG1_74_0_VERSION=1.74.0+ds1-21
18-
# renovate: datasource=repology depName=debian_12/boost1.74 versioning=loose
19-
ENV LIBBOOST_CHRONO1_74_0_VERSION=1.74.0+ds1-21
20-
# renovate: datasource=repology depName=debian_12/boost1.74 versioning=loose
21-
ENV LIBBOOST_SYSTEM1_74_0_VERSION=1.74.0+ds1-21
22-
# renovate: datasource=repology depName=debian_12/openssl versioning=loose
23-
ENV LIBSSL3_VERSION=3.0.17-1~deb12u1
24-
# renovate: datasource=repology depName=debian_12/curl versioning=loose
25-
ENV LIBCURL4_VERSION=7.88.1-10+deb12u12
26-
# renovate: datasource=repology depName=debian_12/libcap2 versioning=loose
27-
ENV LIBCAP2_VERSION=1:2.66-4+deb12u1
28-
# renovate: datasource=repology depName=debian_12/less versioning=loose
29-
ENV LESS_VERSION=590-2.1~deb12u2
30-
# renovate: datasource=repology depName=debian_12/python3-pydantic versioning=loose
31-
ENV PYTHON3_PYDANTIC_VERSION=1.10.4-1
32-
# renovate: datasource=repology depName=debian_12/python-cryptography versioning=loose
33-
ENV PYTHON3_CRYPTOGRAPHY_VERSION=38.0.4-3~deb12u1
34-
# renovate: datasource=repology depName=debian_12/python3-netifaces versioning=loose
35-
ENV PYTHON3_NETIFACES_VERSION=0.11.0-2+b1
36-
# renovate: datasource=repology depName=debian_12/python3-psutil versioning=loose
37-
ENV PYTHON3_PSUTIL_VERSION=5.9.4-1+b1
38-
# renovate: datasource=repology depName=debian_12/python3-dateutil versioning=loose
39-
ENV PYTHON3_DATEUTIL_VERSION=2.8.2-2
4+
# renovate: datasource=repology depName=debian_13/openjdk-21 versioning=loose
5+
ENV OPENJDK_21_JRE_VERSION=21.0.8+9-1
6+
# renovate: datasource=repology depName=debian_13/nodejs versioning=loose
7+
ENV NODEJS_VERSION=20.19.2+dfsg-1
8+
# renovate: datasource=repology depName=debian_13/npm versioning=loose
9+
ENV NPM_VERSION=9.2.0~ds1-3
10+
# renovate: datasource=repology depName=debian_13/python3-pip versioning=loose
11+
ENV PYTHON3_PIP_VERSION=25.1.1+dfsg-1
12+
# renovate: datasource=repology depName=debian_13/sqlite3 versioning=loose
13+
ENV SQLITE3_VERSION=3.46.1-7
14+
# renovate: datasource=repology depName=debian_13/boost1.88 versioning=loose
15+
ENV LIBBOOST_PROGRAM_OPTIONS1_88_0_VERSION=1.88.0-1
16+
# renovate: datasource=repology depName=debian_13/boost1.88 versioning=loose
17+
ENV LIBBOOST_LOG1_88_0_VERSION=1.88.0-1
18+
# renovate: datasource=repology depName=debian_13/boost1.88 versioning=loose
19+
ENV LIBBOOST_CHRONO1_88_0_VERSION=1.88.0-1
20+
# renovate: datasource=repology depName=debian_13/boost1.88 versioning=loose
21+
ENV LIBBOOST_SYSTEM1_88_0_VERSION=1.88.0-1
22+
# renovate: datasource=repology depName=debian_13/openssl versioning=loose
23+
ENV LIBSSL3_VERSION=3.5.1-1
24+
# renovate: datasource=repology depName=debian_13/curl versioning=loose
25+
ENV LIBCURL4_VERSION=8.14.1-2
26+
# renovate: datasource=repology depName=debian_13/libcap2 versioning=loose
27+
ENV LIBCAP2_VERSION=1:2.75-10+b1
28+
# renovate: datasource=repology depName=debian_13/less versioning=loose
29+
ENV LESS_VERSION=668-1
30+
# renovate: datasource=repology depName=debian_13/python3-pydantic versioning=loose
31+
ENV PYTHON3_PYDANTIC_VERSION=2.10.6-2
32+
# renovate: datasource=repology depName=debian_13/python-cryptography versioning=loose
33+
ENV PYTHON3_CRYPTOGRAPHY_VERSION=43.0.0-3
34+
# renovate: datasource=repology depName=debian_13/python3-netifaces versioning=loose
35+
ENV PYTHON3_NETIFACES_VERSION=0.11.0-2+b6
36+
# renovate: datasource=repology depName=debian_13/python3-psutil versioning=loose
37+
ENV PYTHON3_PSUTIL_VERSION=7.0.0-2
38+
# renovate: datasource=repology depName=debian_13/python3-dateutil versioning=loose
39+
ENV PYTHON3_DATEUTIL_VERSION=2.9.0-4
4040

4141
RUN apt update \
4242
&& apt install --no-install-recommends -y \
43-
openjdk-17-jre=${OPENJDK_17_JRE_VERSION} \
43+
openjdk-21-jre=${OPENJDK_21_JRE_VERSION} \
4444
nodejs=${NODEJS_VERSION} \
4545
npm=${NPM_VERSION} \
4646
python3-pip=${PYTHON3_PIP_VERSION} \
4747
sqlite3=${SQLITE3_VERSION} \
48-
libboost-program-options1.74.0=${LIBBOOST_PROGRAM_OPTIONS1_74_0_VERSION} \
49-
libboost-log1.74.0=${LIBBOOST_LOG1_74_0_VERSION} \
50-
libboost-chrono1.74.0=${LIBBOOST_CHRONO1_74_0_VERSION} \
51-
libboost-system1.74.0=${LIBBOOST_SYSTEM1_74_0_VERSION} \
52-
libssl3=${LIBSSL3_VERSION} \
53-
libcurl4=${LIBCURL4_VERSION} \
48+
libboost-program-options1.88.0=${LIBBOOST_PROGRAM_OPTIONS1_88_0_VERSION} \
49+
libboost-log1.88.0=${LIBBOOST_LOG1_88_0_VERSION} \
50+
libboost-chrono1.88.0=${LIBBOOST_CHRONO1_88_0_VERSION} \
51+
libboost-log1.88.0=${LIBBOOST_LOG1_88_0_VERSION} \
52+
libssl3t64=${LIBSSL3_VERSION} \
53+
libcurl4t64=${LIBCURL4_VERSION} \
5454
libcap2=${LIBCAP2_VERSION} \
5555
less=${LESS_VERSION} \
5656
python3-pydantic=${PYTHON3_PYDANTIC_VERSION} \

0 commit comments

Comments
 (0)