Skip to content

Commit c6fd52e

Browse files
authored
chore: squash another layer
1 parent 5114443 commit c6fd52e

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.devcontainer/cpp/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,16 @@ ADD --checksum=sha256:a122d4080a26c1da986bd0e7202b1630eb661a624915ef244f496fdd30
3333
https://www.cisco.com/security/pki/certs/ciscoumbrellaroot.pem /usr/local/share/ca-certificates/ciscoumbrellaroot.pem
3434

3535
# Install the base system with all tool dependencies
36+
# Some tools are installed via pip to get more recent versions
3637
# hadolint ignore=DL3008
3738
RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-base.json,target=/tmp/apt-requirements-base.json \
39+
--mount=type=bind,source=.devcontainer/cpp/requirements.txt,target=/tmp/requirements.txt \
3840
apt-get update && apt-get install -y --no-install-recommends jq \
3941
&& jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-base.json | xargs apt-get install -y --no-install-recommends \
4042
&& update-ca-certificates \
43+
&& python3 -m pip install --break-system-packages --require-hashes --no-cache-dir -r /tmp/requirements.txt
4144
&& rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
4245

43-
# Install some tools via pip to get more recent versions
44-
RUN --mount=type=bind,source=.devcontainer/cpp/requirements.txt,target=/tmp/requirements.txt \
45-
python3 -m pip install --break-system-packages --require-hashes --no-cache-dir -r /tmp/requirements.txt
46-
4746
# Set default environment options for CMake and ccache
4847
ENV CMAKE_GENERATOR="Ninja"
4948
ENV CMAKE_EXPORT_COMPILE_COMMANDS="On"

0 commit comments

Comments
 (0)