Browse code
docker-ci 0.37. Patch hack/dind with latest code for docker-test.
Daniel Mizyrycki authored on 2013/10/30 11:37:56Showing 1 changed files
| ... | ... |
@@ -17,13 +17,12 @@ |
| 17 | 17 |
from docker |
| 18 | 18 |
maintainer Daniel Mizyrycki <daniel@dotcloud.com> |
| 19 | 19 |
|
| 20 |
-# Setup go environment. Extracted from /Dockerfile |
|
| 21 |
-env CGO_ENABLED 0 |
|
| 22 |
-env GOROOT /goroot |
|
| 23 |
-env PATH $PATH:/goroot/bin |
|
| 24 |
-env GOPATH /go:/go/src/github.com/dotcloud/docker/vendor |
|
| 25 |
-volume /var/lib/docker |
|
| 26 |
-workdir /go/src/github.com/dotcloud/docker |
|
| 20 |
+#### FIXME. Temporarily install docker and dind with proper apparmor handling |
|
| 21 |
+run wget -q -O /go/src/github.com/dotcloud/docker/hack/dind http://raw.github.com/jpetazzo/docker/escape-apparmor-confinement/hack/dind |
|
| 22 |
+run chmod +x /go/src/github.com/dotcloud/docker/hack/dind |
|
| 23 |
+ |
|
| 24 |
+# Setup go to the PATH. Extracted from /Dockerfile |
|
| 25 |
+env PATH /usr/local/go/bin:$PATH |
|
| 27 | 26 |
|
| 28 | 27 |
# Add test_docker.sh |
| 29 | 28 |
add test_docker.sh /usr/bin/test_docker.sh |