Browse Source

Dockerfile: Move dockercli to base-dev

Avoids invalidation of dev-systemd-true and dev-base when changing the
CLI version/repository.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit 0f9c8e684a3132b0cfe1f3a04fec68e5f8f6bfc6)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Paweł Gronowski 2 years ago
parent
commit
61d547fd06
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Dockerfile

+ 2 - 2
Dockerfile

@@ -469,8 +469,6 @@ ENV CONTAINERD_NAMESPACE=moby
 WORKDIR /go/src/github.com/docker/docker
 WORKDIR /go/src/github.com/docker/docker
 VOLUME /var/lib/docker
 VOLUME /var/lib/docker
 VOLUME /home/unprivilegeduser/.local/share/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
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
 ENTRYPOINT ["hack/dind"]
 ENTRYPOINT ["hack/dind"]
 
 
@@ -551,6 +549,8 @@ RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \
             libsecret-1-dev \
             libsecret-1-dev \
             libsystemd-dev \
             libsystemd-dev \
             libudev-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
 FROM base AS build
 COPY --from=gowinres /build/ /usr/local/bin/
 COPY --from=gowinres /build/ /usr/local/bin/