opencontainers/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-08-01 05:06:52 +03:00
Code Activity

Replace dind with smaller script

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

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov
2015-07-30 13:20:10 -07:00
parent 45cbce3e45
commit 1735ad788f
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libcontainer/integration/exec_test.go
View File

@ -864,7 +864,6 @@ func TestMountCgroupRO(t *testing.T) {
} }
func TestMountCgroupRW(t *testing.T) { func TestMountCgroupRW(t *testing.T) {
t.Skip("This test is screwed because of dind")
if testing.Short() { if testing.Short() {
return return
} }

6
script/test_Dockerfile
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 && \ RUN mkdir /busybox && \
curl -sSL 'https://github.com/jpetazzo/docker-busybox/raw/buildroot-2014.11/rootfs.tar' | tar -xC /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 && \ COPY script/tmpmount /
chmod +x /dind
WORKDIR /go/src/github.com/opencontainers/runc WORKDIR /go/src/github.com/opencontainers/runc
ENTRYPOINT ["/dind"] ENTRYPOINT ["/tmpmount"]

4
script/tmpmount Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
mount -t tmpfs none /tmp
exec "$@"