From 0f9c8e684a3132b0cfe1f3a04fec68e5f8f6bfc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Mon, 5 Jun 2023 16:32:24 +0200 Subject: [PATCH] Dockerfile: Move dockercli to base-dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids invalidation of dev-systemd-true and dev-base when changing the CLI version/repository. Signed-off-by: Paweł Gronowski --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c7c36eb851..5b93370c56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -469,8 +469,6 @@ ENV CONTAINERD_NAMESPACE=moby WORKDIR /go/src/github.com/docker/docker VOLUME /var/lib/docker VOLUME /home/unprivilegeduser/.local/share/docker -COPY --link --from=dockercli /build/ /usr/local/cli -COPY --link --from=dockercli-integration /build/ /usr/local/cli-integration # Wrap all commands in the "docker-in-docker" script to allow nested containers ENTRYPOINT ["hack/dind"] @@ -551,6 +549,8 @@ RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \ libsecret-1-dev \ libsystemd-dev \ libudev-dev +COPY --link --from=dockercli /build/ /usr/local/cli +COPY --link --from=dockercli-integration /build/ /usr/local/cli-integration FROM base AS build COPY --from=gowinres /build/ /usr/local/bin/