File tree Expand file tree Collapse file tree 3 files changed +28
-15
lines changed
Expand file tree Collapse file tree 3 files changed +28
-15
lines changed Original file line number Diff line number Diff line change @@ -38,6 +38,8 @@ pkgs+=(bison) # Required build tool.
3838pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
3939pkgs+=(cmake) # Required build tool.
4040pkgs+=(curl) # Dependency for tools requiring downloading data.
41+ pkgs+=(dpkg-dev) # Required packaging tool.
42+ pkgs+=(file) # Required packaging tool.
4143pkgs+=(flex) # Required build tool.
4244pkgs+=(git) # Required build tool.
4345pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -50,12 +52,14 @@ apt update
5052apt install -y "${pkgs[@]}"
5153EOF
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.
6165ARG NONROOT_USER
Original file line number Diff line number Diff line change 3737COPY --from=rocky /usr/bin/bison /usr/bin/bison
3838COPY --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.
4550ARG NONROOT_USER
Original file line number Diff line number Diff line change @@ -27,6 +27,8 @@ pkgs+=(bison) # Required build tool.
2727pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
2828pkgs+=(cmake) # Required build tool.
2929pkgs+=(curl) # Dependency for tools requiring downloading data.
30+ pkgs+=(dpkg-dev) # Required packaging tool.
31+ pkgs+=(file) # Required packaging tool.
3032pkgs+=(flex) # Required build tool.
3133pkgs+=(git) # Required build tool.
3234pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
@@ -39,12 +41,14 @@ apt update
3941apt install -y "${pkgs[@]}"
4042EOF
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.
5054ARG NONROOT_USER
You can’t perform that action at this time.
0 commit comments