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

Fix Dockerfile.e2e build

This images is used to run integration and integration-cli tests on
anything that implements the docker api :). The image wasn't building
anywore :D

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2018-02-22 10:51:50 +01:00
parent 49ad3d69a7
commit 9c46b587ee
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3

View file

@ -21,13 +21,14 @@ RUN contrib/download-frozen-image-v2.sh /output/docker-frozen-images \
debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \
hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c
# Download Docker CLI binary # Install dockercli
COPY hack/dockerfile hack/dockerfile # Please edit hack/dockerfile/install/<name>.installer to update them.
RUN hack/dockerfile/install.sh dockercli COPY hack/dockerfile/install hack/dockerfile/install
RUN ./hack/dockerfile/install/install.sh dockercli
# Set tag and add sources # Set tag and add sources
ARG DOCKER_GITCOMMIT ARG DOCKER_GITCOMMIT
ENV DOCKER_GITCOMMIT=$DOCKER_GITCOMMIT ENV DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT:-undefined}
ADD . . ADD . .
# Build DockerSuite.TestBuild* dependency # Build DockerSuite.TestBuild* dependency