Merge pull request #18642 from tophj-ibm/add-z-unshare-image

Add unshare image to s390x Dockerfile
Upstream-commit: 0c2dd27581048102b5d8803f95e6bc58834842d7
Component: engine
This commit is contained in:
Jess Frazelle
2015-12-14 11:32:27 -08:00
+2 -1
View File
@@ -80,7 +80,8 @@ ENV IMAGEREPO s390x
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
$IMAGEREPO/busybox:latest \
$IMAGEREPO/hello-world:frozen
$IMAGEREPO/hello-world:frozen \
$IMAGEREPO/unshare:latest
# Wrap all commands in the "docker-in-docker" script to allow nested containers
ENTRYPOINT ["hack/dind"]