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>
This commit is contained in:
parent
45cbce3e45
commit
1735ad788f
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/bash
|
||||
|
||||
mount -t tmpfs none /tmp
|
||||
exec "$@"
|
Loading…
Reference in New Issue