docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Add unshare image to s390x Dockerfile
This commit is contained in:
Jess Frazelle 2015-12-14 11:32:27 -08:00
parent 984282e28c 52e53814ea
commit 0c2dd27581
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.s390x
View File

@ -80,7 +80,8 @@ ENV IMAGEREPO s390x
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
$IMAGEREPO/busybox:latest \ $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 # Wrap all commands in the "docker-in-docker" script to allow nested containers
ENTRYPOINT ["hack/dind"] ENTRYPOINT ["hack/dind"]