Skip to content

Commit ecd3ef1

Browse files
committed
Add required packaging and pipeline tools. Update Conan
1 parent 6ccb462 commit ecd3ef1

File tree

3 files changed

+28
-15
lines changed

3 files changed

+28
-15
lines changed

docker/debian/Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ pkgs+=(bison) # Required build tool.
3838
pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
3939
pkgs+=(cmake) # Required build tool.
4040
pkgs+=(curl) # Dependency for tools requiring downloading data.
41+
pkgs+=(dpkg-dev) # Required packaging tool.
42+
pkgs+=(file) # Required packaging tool.
4143
pkgs+=(flex) # Required build tool.
4244
pkgs+=(git) # Required build tool.
4345
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -50,12 +52,14 @@ apt update
5052
apt install -y "${pkgs[@]}"
5153
EOF
5254

53-
# Install Conan.
54-
ARG CONAN_VERSION
55-
RUN PIPX_HOME=/opt/pipx \
56-
PIPX_BIN_DIR=/usr/bin \
57-
PIPX_MAN_DIR=/usr/share/man \
58-
pipx install conan==${CONAN_VERSION}
55+
# Install Conan && gcovr.
56+
ARG CONAN_VERSION=2.18.0
57+
ARG GCOVR_VERSION=8.2
58+
ENV PIPX_HOME=/opt/pipx \
59+
PIPX_BIN_DIR=/usr/local/bin \
60+
PIPX_MAN_DIR=/usr/share/man
61+
RUN pipx install conan==${CONAN_VERSION} && \
62+
pipx install gcovr==${GCOVR_VERSION}
5963

6064
# Create the user to switch to, once all packages have been installed.
6165
ARG NONROOT_USER

docker/rhel/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@ EOF
3737
COPY --from=rocky /usr/bin/bison /usr/bin/bison
3838
COPY --from=rocky /usr/bin/flex /usr/bin/flex
3939

40-
# Install Conan.
41-
ARG CONAN_VERSION
42-
RUN pip install conan==${CONAN_VERSION}
40+
# Install Conan && gcovr.
41+
ARG CONAN_VERSION=2.18.0
42+
ARG GCOVR_VERSION=8.2
43+
ENV PIPX_HOME=/opt/pipx \
44+
PIPX_BIN_DIR=/usr/local/bin \
45+
PIPX_MAN_DIR=/usr/share/man
46+
RUN pipx install conan==${CONAN_VERSION} && \
47+
pipx install gcovr==${GCOVR_VERSION}
4348

4449
# Create the user to switch to, once all packages have been installed.
4550
ARG NONROOT_USER

docker/ubuntu/Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ pkgs+=(bison) # Required build tool.
2727
pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
2828
pkgs+=(cmake) # Required build tool.
2929
pkgs+=(curl) # Dependency for tools requiring downloading data.
30+
pkgs+=(dpkg-dev) # Required packaging tool.
31+
pkgs+=(file) # Required packaging tool.
3032
pkgs+=(flex) # Required build tool.
3133
pkgs+=(git) # Required build tool.
3234
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -39,12 +41,14 @@ apt update
3941
apt install -y "${pkgs[@]}"
4042
EOF
4143

42-
# Install Conan.
43-
ARG CONAN_VERSION
44-
RUN PIPX_HOME=/opt/pipx \
45-
PIPX_BIN_DIR=/usr/bin \
46-
PIPX_MAN_DIR=/usr/share/man \
47-
pipx install conan==${CONAN_VERSION}
44+
# Install Conan && gcovr.
45+
ARG CONAN_VERSION=2.18.0
46+
ARG GCOVR_VERSION=8.2
47+
ENV PIPX_HOME=/opt/pipx \
48+
PIPX_BIN_DIR=/usr/local/bin \
49+
PIPX_MAN_DIR=/usr/share/man
50+
RUN pipx install conan==${CONAN_VERSION} && \
51+
pipx install gcovr==${GCOVR_VERSION}
4852

4953
# Create the user to switch to, once all packages have been installed.
5054
ARG NONROOT_USER

0 commit comments

Comments
 (0)