Skip to content

Commit 05a6763

Browse files
committed
Add required packaging and pipeline tools. Update Conan
1 parent 2d8b899 commit 05a6763

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

docker/debian/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ RUN <<EOF
3434
pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
3535
pkgs+=(cmake) # Required build tool.
3636
pkgs+=(curl) # Dependency for tools requiring downloading data.
37+
pkgs+=(file) # Required packaging tool.
3738
pkgs+=(git) # Required build tool.
3839
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
3940
pkgs+=(jq) # Pretty printing.
@@ -44,10 +45,12 @@ EOF
4445

4546
# Install Conan.
4647
ARG CONAN_VERSION=2.17.0
48+
ARG GCOVR_VERSION=8.2
4749
RUN PIPX_HOME=/opt/pipx \
4850
PIPX_BIN_DIR=/usr/bin \
4951
PIPX_MAN_DIR=/usr/share/man \
50-
pipx install conan==${CONAN_VERSION}
52+
pipx install conan==${CONAN_VERSION} && \
53+
pipx install gcovr
5154

5255
# Create the user to switch to, once all packages have been installed.
5356
ARG NONROOT_USER=ci

docker/ubuntu/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN <<EOF
2525
pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
2626
pkgs+=(cmake) # Required build tool.
2727
pkgs+=(curl) # Dependency for tools requiring downloading data.
28+
pkgs+=(file) # Required packaging tool.
2829
pkgs+=(git) # Required build tool.
2930
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
3031
pkgs+=(jq) # Pretty printing.
@@ -35,10 +36,12 @@ EOF
3536

3637
# Install Conan.
3738
ARG CONAN_VERSION=2.17.0
39+
ARG GCOVR_VERSION=8.2
3840
RUN PIPX_HOME=/opt/pipx \
3941
PIPX_BIN_DIR=/usr/bin \
4042
PIPX_MAN_DIR=/usr/share/man \
41-
pipx install conan==${CONAN_VERSION}
43+
pipx install conan==${CONAN_VERSION} && \
44+
pipx install gcovr
4245

4346
# Create the user to switch to, once all packages have been installed.
4447
ARG NONROOT_USER=ci

0 commit comments

Comments
 (0)