Skip to content

Commit 52840e9

Browse files
committed
chore: don't remove bind mounted files
1 parent 4ad7bec commit 52840e9

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

.devcontainer/cpp/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1919
RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-base.json,target=/tmp/apt-requirements-base.json \
2020
apt-get update && apt-get install -y --no-install-recommends jq \
2121
&& jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-base.json | xargs apt-get install -y --no-install-recommends \
22-
&& rm /tmp/apt-requirements-base.json \
2322
&& rm -rf /var/lib/apt/lists/*
2423

2524
# Include the Cisco Umbrella PKI Root
@@ -28,8 +27,7 @@ RUN wget -qO /usr/local/share/ca-certificates/Cisco_Umbrella_Root_CA.crt https:/
2827

2928
# Install some tools via pip to get more recent versions
3029
RUN --mount=type=bind,source=.devcontainer/cpp/requirements.txt,target=/tmp/requirements.txt \
31-
python3 -m pip install --break-system-packages --require-hashes --no-cache-dir -r /tmp/requirements.txt \
32-
&& rm -rf /tmp/requirements.txt
30+
python3 -m pip install --break-system-packages --require-hashes --no-cache-dir -r /tmp/requirements.txt
3331

3432
# Set default environment options for CMake and ccache
3533
ENV CCACHE_DIR=/cache/.ccache
@@ -49,7 +47,6 @@ RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-clang.json,targe
4947
&& echo -e 'Package: *\nPin: origin "apt.llvm.org"\nPin-Priority: 1000' > /etc/apt/preferences \
5048
&& apt-get update \
5149
&& jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-clang.json | xargs apt-get install -y --no-install-recommends \
52-
&& rm /tmp/apt-requirements* \
5350
&& rm -rf /var/lib/apt/lists/*
5451
ENV PATH="$PATH:/usr/lib/llvm-${CLANG_VERSION}/bin"
5552

.devcontainer/rust/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1515
RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-base.json,target=/tmp/apt-requirements-base.json \
1616
apt-get update && apt-get install -y --no-install-recommends jq \
1717
&& jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-base.json | xargs apt-get install -y --no-install-recommends \
18-
&& rm /tmp/apt-requirements-base.json \
1918
&& rm -rf /var/lib/apt/lists/*
2019

2120
# Include the Cisco Umbrella PKI Root

0 commit comments

Comments
 (0)