Merge pull request #164 from LK4D4/remove_dind

Remove dind
This commit is contained in:
Mrunal Patel
2015-07-31 07:53:03 -07:00
3 changed files with 6 additions and 5 deletions
-1
View File
@@ -864,7 +864,6 @@ func TestMountCgroupRO(t *testing.T) {
}
func TestMountCgroupRW(t *testing.T) {
t.Skip("This test is screwed because of dind")
if testing.Short() {
return
}
+2 -4
View File
@@ -7,8 +7,6 @@ RUN apt-get update && apt-get install -y iptables criu=1.6-2 && rm -rf /var/lib/
RUN mkdir /busybox && \
curl -sSL 'https://github.com/jpetazzo/docker-busybox/raw/buildroot-2014.11/rootfs.tar' | tar -xC /busybox
RUN curl -sSL https://raw.githubusercontent.com/docker/docker/master/hack/dind -o /dind && \
chmod +x /dind
COPY script/tmpmount /
WORKDIR /go/src/github.com/opencontainers/runc
ENTRYPOINT ["/dind"]
ENTRYPOINT ["/tmpmount"]
+4
View File
@@ -0,0 +1,4 @@
#!/bin/bash
mount -t tmpfs none /tmp
exec "$@"