Skip to content

Commit ed12c19

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

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

docker/debian/Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ apt update
5050
apt install -y "${pkgs[@]}"
5151
EOF
5252

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}
53+
# Install Conan && gcovr.
54+
ARG CONAN_VERSION=2.18.0
55+
ARG GCOVR_VERSION=8.2
56+
ENV PIPX_HOME=/opt/pipx \
57+
PIPX_BIN_DIR=/usr/local/bin \
58+
PIPX_MAN_DIR=/usr/share/man
59+
RUN pipx install conan==${CONAN_VERSION} && \
60+
pipx install gcovr==${GCOVR_VERSION}
5961

6062
# Create the user to switch to, once all packages have been installed.
6163
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: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,14 @@ apt update
3939
apt install -y "${pkgs[@]}"
4040
EOF
4141

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}
42+
# Install Conan && gcovr.
43+
ARG CONAN_VERSION=2.18.0
44+
ARG GCOVR_VERSION=8.2
45+
ENV PIPX_HOME=/opt/pipx \
46+
PIPX_BIN_DIR=/usr/local/bin \
47+
PIPX_MAN_DIR=/usr/share/man
48+
RUN pipx install conan==${CONAN_VERSION} && \
49+
pipx install gcovr==${GCOVR_VERSION}
4850

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

0 commit comments

Comments
 (0)