From 1735ad788f2f744f25a5c9938384e6ca1f54fa58 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <lk4d4@docker.com>
Date: Thu, 30 Jul 2015 13:20:10 -0700
Subject: [PATCH] Replace dind with smaller script

It just mounts /tmp into tmpfs. We need this because criu tests has
problems on overlayfs.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
---
 libcontainer/integration/exec_test.go | 1 -
 script/test_Dockerfile                | 6 ++----
 script/tmpmount                       | 4 ++++
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100755 script/tmpmount

diff --git a/libcontainer/integration/exec_test.go b/libcontainer/integration/exec_test.go
index d8b6e16b..eb7019d6 100644
--- a/libcontainer/integration/exec_test.go
+++ b/libcontainer/integration/exec_test.go
@@ -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
 	}
diff --git a/script/test_Dockerfile b/script/test_Dockerfile
index 8efe0378..4f4206b2 100644
--- a/script/test_Dockerfile
+++ b/script/test_Dockerfile
@@ -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"]
diff --git a/script/tmpmount b/script/tmpmount
new file mode 100755
index 00000000..5ac6bc2b
--- /dev/null
+++ b/script/tmpmount
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+mount -t tmpfs none /tmp
+exec "$@"