Skip to content

Commit 9188d3f

Browse files
authored
chore: move extraction of archive
1 parent 620626a commit 9188d3f

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.devcontainer/cpp/Dockerfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,20 @@ ARG DOCKER_VERSION=28.2.2
33
FROM scratch AS downloader-amd64
44

55
ADD --checksum=sha256:53dc06dc3f775282ddff93b2d0974bbe6480761018c61e7a797342a9c7f14e23 \
6-
https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz
6+
https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz /docker.tgz
77

88
FROM scratch AS downloader-arm64
99

1010
ADD --checksum=sha256:c9506628d1845c69230df3d87e2eedd7980caf8bd966f5e6a5d7a2364de42497 \
11-
https://download.docker.com/linux/static/stable/aarch64/docker-${DOCKER_VERSION}.tgz
11+
https://download.docker.com/linux/static/stable/aarch64/docker-${DOCKER_VERSION}.tgz /docker.tgz
1212

1313
FROM downloader-$TARGETARCH AS downloader
1414

15+
FROM ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233 AS extractor
16+
17+
RUN --mount=from=downloader,target=/tmp \
18+
tar xzf /tmp/docker.tgz -C /tmp
19+
1520
FROM ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233
1621

1722
ARG BATS_VERSION=1.11.0
@@ -69,7 +74,7 @@ RUN mkdir /opt/gcc-arm-none-eabi \
6974
ENV PATH="$PATH:/opt/gcc-arm-none-eabi/bin"
7075

7176
# Install docker-cli for Docker-from-Docker tools
72-
COPY --from=downloader /docker/docker/docker /usr/local/bin
77+
COPY --from=extractor /tmp/docker/docker /usr/local/bin
7378

7479
# Install bats
7580
RUN batstmp="$(mktemp -d /tmp/bats-core-${BATS_VERSION}.XXXX)" \

0 commit comments

Comments
 (0)