p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker-ci 0.37. Patch hack/dind with latest code for docker-test.

Browse Source 
Upstream-commit: efb4c800a7c8167cf2202466a720c0fad7001a5d
Component: engine
This commit is contained in:
Daniel Mizyrycki
2013-10-29 19:37:56 -07:00
parent 7a7c9f0f1d
commit 837c6b480c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/hack/infrastructure/docker-ci/docker-test/Dockerfile
View File

@ -17,13 +17,12 @@
from docker
maintainer Daniel Mizyrycki <daniel@dotcloud.com>
# Setup go environment. Extracted from /Dockerfile
env CGO_ENABLED 0
env GOROOT /goroot
env PATH $PATH:/goroot/bin
env GOPATH /go:/go/src/github.com/dotcloud/docker/vendor
volume /var/lib/docker
workdir /go/src/github.com/dotcloud/docker
#### FIXME. Temporarily install docker and dind with proper apparmor handling
run wget -q -O /go/src/github.com/dotcloud/docker/hack/dind http://raw.github.com/jpetazzo/docker/escape-apparmor-confinement/hack/dind
run chmod +x /go/src/github.com/dotcloud/docker/hack/dind
# Setup go to the PATH. Extracted from /Dockerfile
env PATH /usr/local/go/bin:$PATH
# Add test_docker.sh
add test_docker.sh /usr/bin/test_docker.sh