Bläddra i källkod

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 <cpuguy83@gmail.com>
Brian Goff 5 år sedan
förälder
incheckning
05ec12b082
1 ändrade filer med 3 tillägg och 1 borttagningar
  1. 3 1
      Dockerfile

+ 3 - 1
Dockerfile

@@ -341,6 +341,8 @@ RUN mkdir -p hack \
   && chmod +x hack/dind-systemd
   && chmod +x hack/dind-systemd
 ENTRYPOINT ["hack/dind-systemd"]
 ENTRYPOINT ["hack/dind-systemd"]
 
 
+FROM dev-systemd-${SYSTEMD} AS dev
+
 FROM runtime-dev AS binary-base
 FROM runtime-dev AS binary-base
 ARG DOCKER_GITCOMMIT=HEAD
 ARG DOCKER_GITCOMMIT=HEAD
 ENV DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT}
 ENV DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT}
@@ -392,5 +394,5 @@ COPY --from=build-dynbinary /build/bundles/ /
 FROM scratch AS cross
 FROM scratch AS cross
 COPY --from=build-cross /build/bundles/ /
 COPY --from=build-cross /build/bundles/ /
 
 
-FROM dev-systemd-${SYSTEMD} AS final
+FROM dev AS final
 COPY . /go/src/github.com/docker/docker
 COPY . /go/src/github.com/docker/docker