1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #40630 from cpuguy83/fix_make_shell

Fix `make shell`
This commit is contained in:
Sebastiaan van Stijn 2020-03-06 11:31:30 +01:00 committed by GitHub
commit 8d0b2a044f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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