diff --git a/examples/docker.yml b/examples/docker.yml index cdeb2188e..f2b657bc7 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 + - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/gcp.yml b/examples/gcp.yml index e7f2b5a4a..03530eab5 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 + - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/sshd.yml b/examples/sshd.yml index 7b8cde517..621e64ff7 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 + - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/examples/vmware.yml b/examples/vmware.yml index cec5bdd1d..b50f98271 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" init: - - mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 + - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/moby.yml b/moby.yml index a647d46de..c359bef44 100644 --- a/moby.yml +++ b/moby.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 + - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/pkg/init/etc/init.d/containers b/pkg/init/etc/init.d/containers index 9ff566c96..00bdcf116 100755 --- a/pkg/init/etc/init.d/containers +++ b/pkg/init/etc/init.d/containers @@ -7,6 +7,7 @@ then for f in $(find /containers/onboot -mindepth 1 -maxdepth 1 | sort) do base="$(basename $f)" + /bin/mount --bind "$f/rootfs" "$f/rootfs" /usr/bin/runc run --bundle "$f" "$(basename $f)" printf " - $base\n" done @@ -20,6 +21,7 @@ then for f in $(find /containers/services -mindepth 1 -maxdepth 1 | sort) do base="$(basename $f)" + /bin/mount --bind "$f/rootfs" "$f/rootfs" log="/var/log/$base.log" /sbin/start-stop-daemon --start --pidfile /run/$base.pid --exec /usr/bin/runc -- run --bundle "$f" --pid-file /run/$base.pid "$(basename $f)" $log >$log & printf " - $base\n" diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index 0b09b7375..23154d02f 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" init: - - mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 + - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/test/test.yml b/test/test.yml index c7efe5204..8c16be90e 100644 --- a/test/test.yml +++ b/test/test.yml @@ -2,7 +2,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0" init: - - mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 + - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index 94d4a234b..3284cf21c 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -6,7 +6,7 @@ kernel: image: "mobylinux/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 + - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:c7f6ecdcbcb615a53edee556ba03c7c873bc8488 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935