Skip to content

Commit db417db

Browse files
committed
gcovr version; install to local/bin
1 parent 05a6763 commit db417db

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

docker/debian/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ RUN <<EOF
4343
apt install -y "${pkgs[@]}"
4444
EOF
4545

46-
# Install Conan.
46+
# Install Conan && gcovr
4747
ARG CONAN_VERSION=2.17.0
4848
ARG GCOVR_VERSION=8.2
49-
RUN PIPX_HOME=/opt/pipx \
50-
PIPX_BIN_DIR=/usr/bin \
51-
PIPX_MAN_DIR=/usr/share/man \
52-
pipx install conan==${CONAN_VERSION} && \
53-
pipx install gcovr
49+
ENV PIPX_HOME=/opt/pipx \
50+
PIPX_BIN_DIR=/usr/local/bin \
51+
PIPX_MAN_DIR=/usr/share/man
52+
RUN pipx install conan==${CONAN_VERSION} && \
53+
pipx install gcovr==${GCOVR_VERSION}
5454

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

docker/ubuntu/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ RUN <<EOF
3434
apt install -y "${pkgs[@]}"
3535
EOF
3636

37-
# Install Conan.
37+
# Install Conan && gcovr
3838
ARG CONAN_VERSION=2.17.0
3939
ARG GCOVR_VERSION=8.2
40-
RUN PIPX_HOME=/opt/pipx \
41-
PIPX_BIN_DIR=/usr/bin \
42-
PIPX_MAN_DIR=/usr/share/man \
43-
pipx install conan==${CONAN_VERSION} && \
44-
pipx install gcovr
40+
ENV PIPX_HOME=/opt/pipx \
41+
PIPX_BIN_DIR=/usr/local/bin \
42+
PIPX_MAN_DIR=/usr/share/man
43+
RUN pipx install conan==${CONAN_VERSION} && \
44+
pipx install gcovr==${GCOVR_VERSION}
4545

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

0 commit comments

Comments
 (0)