beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dockerfile.e2e: builder: change output directory to simplify copy

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b73e3407e3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-04-19 16:26:53 +02:00
parent 7d3405b4ba
commit cb8d67505d
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile.e2e
View file

@ -44,7 +44,7 @@ ARG DOCKER_GITCOMMIT
ENV DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT:-undefined} ENV DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT:-undefined}
COPY . . COPY . .
RUN hack/make.sh build-integration-test-binary RUN hack/make.sh build-integration-test-binary
RUN mkdir -p /build/tests && find . -name test.main -exec cp --parents '{}' /build/tests \; RUN mkdir -p /build/ && find . -name test.main -exec cp --parents '{}' /build \;
## Generate testing image ## Generate testing image
FROM alpine:3.9 as runner FROM alpine:3.9 as runner
@ -77,4 +77,4 @@ COPY integration-cli/fixtures /tests/integration-cli/fixtures
COPY --from=frozen-images /build/ /docker-frozen-images COPY --from=frozen-images /build/ /docker-frozen-images
COPY --from=dockercli /build/ /usr/bin/ COPY --from=dockercli /build/ /usr/bin/
COPY --from=contrib /build/ /tests/contrib/ COPY --from=contrib /build/ /tests/contrib/
COPY --from=builder /build/tests /tests COPY --from=builder /build/ /tests/