From 05ec12b082d779959a8ea07ff89c3de1f53c2f6b Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Thu, 5 Mar 2020 22:36:54 -0800 Subject: [PATCH] Fix `make shell` a3292263a3cb29c972b41511aeb0a3e36c8468c7 broke `make shell` which is trying to build the `dev` Dockerfile stage which no longer exists after the change. This adds the stage back. Signed-off-by: Brian Goff --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 13d2f69794..4e8d1f568d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -341,6 +341,8 @@ RUN mkdir -p hack \ && chmod +x hack/dind-systemd ENTRYPOINT ["hack/dind-systemd"] +FROM dev-systemd-${SYSTEMD} AS dev + FROM runtime-dev AS binary-base ARG DOCKER_GITCOMMIT=HEAD ENV DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT} @@ -392,5 +394,5 @@ COPY --from=build-dynbinary /build/bundles/ / FROM scratch AS cross COPY --from=build-cross /build/bundles/ / -FROM dev-systemd-${SYSTEMD} AS final +FROM dev AS final COPY . /go/src/github.com/docker/docker