diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index dbc3c7092..a12d21ad2 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -61,7 +61,7 @@ services: # VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock # to a socket on the host. - name: vsudd - image: linuxkit/vsudd:v0.6 + image: linuxkit/vsudd:98e554e4f3024c318e42c1f6876b541b654acd9f binds: - /var/run:/var/run command: ["/vsudd", "-inport", "2376:unix:/var/run/docker.sock"] @@ -78,7 +78,7 @@ services: image: linuxkit/trim-after-delete:v0.6 # When the host resumes from sleep, force a clock resync - name: host-timesync-daemon - image: linuxkit/host-timesync-daemon:v0.6 + image: linuxkit/host-timesync-daemon:613dc55e67470ec375335a1958650c3711dc4aa6 # Run dockerd with the vpnkit userland proxy from the vpnkit-forwarder container. # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # for vpnkit coordination and /run/config/docker for the configuration file. diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 38a7e3706..3e1d12573 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -11,7 +11,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd - image: linuxkit/vsudd:v0.6 + image: linuxkit/vsudd:98e554e4f3024c318e42c1f6876b541b654acd9f binds: - /run/containerd/containerd.sock:/run/containerd/containerd.sock command: ["/vsudd", diff --git a/pkg/host-timesync-daemon/Dockerfile b/pkg/host-timesync-daemon/Dockerfile index e56c16fc2..89de747d8 100644 --- a/pkg/host-timesync-daemon/Dockerfile +++ b/pkg/host-timesync-daemon/Dockerfile @@ -3,7 +3,7 @@ FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev git ENV GOPATH=/go PATH=$PATH:/go/bin -ENV VIRTSOCK_COMMIT=a381dcc5bcddf1d7f449495c373dbf70f8e501c0 +ENV VIRTSOCK_COMMIT=f1e32d3189e0dbb81c0e752a4e214617487eb41f RUN mkdir -p $GOPATH/src/github.com/linuxkit && \ cd $GOPATH/src/github.com/linuxkit && \ git clone https://github.com/linuxkit/virtsock.git && \ diff --git a/pkg/vsudd/Dockerfile b/pkg/vsudd/Dockerfile index be283f40f..6738c889d 100644 --- a/pkg/vsudd/Dockerfile +++ b/pkg/vsudd/Dockerfile @@ -2,7 +2,7 @@ FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror RUN apk add --no-cache go musl-dev git build-base ENV GOPATH=/go PATH=$PATH:/go/bin -ENV VIRTSOCK_COMMIT=a381dcc5bcddf1d7f449495c373dbf70f8e501c0 +ENV VIRTSOCK_COMMIT=f1e32d3189e0dbb81c0e752a4e214617487eb41f RUN git clone https://github.com/linuxkit/virtsock.git /go/src/github.com/linuxkit/virtsock && \ cd /go/src/github.com/linuxkit/virtsock && \ @@ -10,5 +10,5 @@ RUN git clone https://github.com/linuxkit/virtsock.git /go/src/github.com/linuxk make vsudd FROM scratch -COPY --from=mirror /go/src/github.com/linuxkit/virtsock/build/vsudd.linux /vsudd +COPY --from=mirror /go/src/github.com/linuxkit/virtsock/bin/vsudd.linux /vsudd ENTRYPOINT ["/vsudd"] diff --git a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml index 2629d4e3e..35a764397 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml index 100cf141c..1b11046da 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml index 4c50e9102..8e61a211a 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml index 4c50e9102..8e61a211a 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml index 6de760115..31990a9c3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml index 6de760115..31990a9c3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml index bca20c0fa..8e7e52018 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml index be850661f..6de70a0d8 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml index bbc03720a..cf1edaa6f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml index bbc03720a..cf1edaa6f 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml index 8fc5d6956..c7e2b281e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml index 8fc5d6956..c7e2b281e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml index bafe11d93..27a1714e1 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml index 8fa9d5f58..3ab109118 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml index db89d33b9..fa43ed944 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml index db89d33b9..fa43ed944 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml index 715a187e9..4a5942427 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml index 715a187e9..4a5942427 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml index ae541e9b9..71be1c4e3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml index a02309fd3..fba8a23d9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml index 082a5c725..069dd64f3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml index 082a5c725..069dd64f3 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml index cf6170e53..a2e43a004 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml index cf6170e53..a2e43a004 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "tcp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml index 1e8c299e1..fff8a51d5 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml index 17882a2d4..340f028d7 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml index 7b5231f2b..7a4531f34 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml index 7b5231f2b..7a4531f34 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml index cc93d3204..fa66c51f2 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml index cc93d3204..fa66c51f2 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml index 2c703fcd0..53df3d8c2 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml index aff9c6021..2c82cb165 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml index 6b0bd3551..15081aaa9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml index 6b0bd3551..15081aaa9 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml index 3f9147764..f405f1685 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml index 3f9147764..f405f1685 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "4", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml index cdf616062..13e272c85 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml index 9084a9a20..a2340d8a5 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml index cae28ea5e..ddd262d00 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml index cae28ea5e..ddd262d00 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml index 22e358bf1..c86462c1e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml index 22e358bf1..c86462c1e 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml index 6dc698d8d..e49c6928b 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml index 50b254e74..cecc1ac2d 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml index 9a963f2f8..38d71b838 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml index 9a963f2f8..38d71b838 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml index b7e001cac..759a71368 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml index b7e001cac..759a71368 100644 --- a/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-ip", "6", "-p", "udp", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml index fa4cc917a..dfaf093ff 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml index b61f8b3fd..73d88c5c7 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/010_echo-short-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml index bd8650f5d..96c715999 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml index bd8650f5d..96c715999 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/011_echo-short-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml index 6d8bfd6d9..0bf0cd4bf 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml index 6d8bfd6d9..0bf0cd4bf 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/012_echo-short-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-s", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml index 8e5019aba..61b1f8b7e 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1", "-r"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml index 2d6826a46..249f11ed0 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/015_echo-long-1con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "1"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml index 3d0bacaa7..c83f68999 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml index 3d0bacaa7..c83f68999 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/016_echo-long-10con-single/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "1", "-l", "5", "-i", "15", "-p", "unix", "-c", "10"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml index 52e8a6582..c29544b26 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml index 52e8a6582..c29544b26 100644 --- a/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml +++ b/test/cases/020_kernel/110_namespace/050_unix-domain/017_echo-long-5con-multi/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "5", "-l", "5", "-i", "15", "-p", "unix", "-c", "5"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml index 8679e1851..9275b3bfe 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/010_veth-unix-domain-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "mix"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml index ba75d9a2f..a3f97691c 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "mix-reverse"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml index 41cf132a5..f7d06c5cc 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/012_veth-ipv4-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv4"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml index 49b1fd36e..54fa7408b 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/013_veth-ipv6-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "mix-ipv6"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml index d1ab7a80b..6e7462191 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/014_veth-tcp-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "mix-tcp"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml index 25e9b95e2..98c23d11d 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/015_veth-udp-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "mix-udp"] mounts: # for runc - type: cgroup diff --git a/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml index 91f96daf0..820e78f42 100644 --- a/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml +++ b/test/cases/020_kernel/110_namespace/100_mix/020_unix-domain-echo/test.yml @@ -1,6 +1,6 @@ onboot: - name: test-ns - image: linuxkit/test-ns:4dfa650d8f9c51fa68efbf75f8f12031f366e783 + image: linuxkit/test-ns:a21f996641f391d467a7842e85088a304d24fae5 command: ["/bin/sh", "/runp-runc-net.sh", "mix-unix"] mounts: # for runc - type: cgroup diff --git a/test/pkg/ns/Dockerfile b/test/pkg/ns/Dockerfile index b11be8db0..cdc38491c 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -15,7 +15,7 @@ RUN apk add --no-cache \ go \ musl-dev ENV GOPATH=/go PATH=$PATH:/go/bin -ENV VIRTSOCK_COMMIT=0416e3d85541e7a067fd000c69f50997b5d47c93 +ENV VIRTSOCK_COMMIT=f1e32d3189e0dbb81c0e752a4e214617487eb41f RUN git clone https://github.com/linuxkit/virtsock.git /go/src/github.com/linuxkit/virtsock && \ cd /go/src/github.com/linuxkit/virtsock && \ git checkout $VIRTSOCK_COMMIT && \ diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index 46a75a5d7..31cfcd45f 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -9,17 +9,17 @@ FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin -ENV VIRTSOCK_COMMIT=3bfdf22e3b63a7d130ae5db41c2d76eaffa444d4 -RUN mkdir -p $GOPATH/src/github.com/rneugeba && \ - cd $GOPATH/src/github.com/rneugeba && \ - git clone https://github.com/rneugeba/virtsock.git -WORKDIR $GOPATH/src/github.com/rneugeba/virtsock +ENV VIRTSOCK_COMMIT=f1e32d3189e0dbb81c0e752a4e214617487eb41f +RUN mkdir -p $GOPATH/src/github.com/linuxkit && \ + cd $GOPATH/src/github.com/linuxkit && \ + git clone https://github.com/linuxkit/virtsock.git +WORKDIR $GOPATH/src/github.com/linuxkit/virtsock RUN git checkout $VIRTSOCK_COMMIT # Don't use go-compile.sh quite yet as the virtsock package is not yet lint free -RUN make build/virtsock_stress.linux && \ - cp -a build/virtsock_stress.linux /virtsock_stress +RUN make bin/sock_stress.linux && \ + cp -a bin/sock_stress.linux /sock_stress FROM scratch COPY --from=mirror /out/ / -COPY --from=build virtsock_stress usr/bin/virtsock_stress -CMD ["/sbin/tini", "/usr/bin/virtsock_stress", "-s", "-v", "1"] +COPY --from=build sock_stress usr/bin/sock_stress +CMD ["/sbin/tini", "/usr/bin/sock_stress", "-s", "-v", "1"]