mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Dockerfile.e2e: builder: change output directory to simplify copy
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:
parent
7d3405b4ba
commit
cb8d67505d
1 changed files with 2 additions and 2 deletions
|
@ -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/
|
||||||
|
|
Loading…
Reference in a new issue