github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-30 16:40:25 +00:00
Code Issues Projects Releases Wiki Activity

Make each rootfs a mountpoint by binding

Browse Source 
Otherwise shared mounts do not work correctly with `runc`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-04-08 21:10:30 +01:00
parent 508f12350a
commit c40351a0a8
9 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docker.yml
View File

@@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
examples/gcp.yml
View File

@@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
examples/sshd.yml
View File

@@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
examples/vmware.yml
View File

@@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=tty0 page_poison=1" cmdline: "console=tty0 page_poison=1"
init: init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
moby.yml
View File

@@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
pkg/init/etc/init.d/containers
View File

@@ -7,6 +7,7 @@ then
for f in $(find /containers/onboot -mindepth 1 -maxdepth 1 | sort) for f in $(find /containers/onboot -mindepth 1 -maxdepth 1 | sort)
do do
base="$(basename $f)" base="$(basename $f)"
/bin/mount --bind "$f/rootfs" "$f/rootfs"
/usr/bin/runc run --bundle "$f" "$(basename $f)" /usr/bin/runc run --bundle "$f" "$(basename $f)"
printf " - $base\n" printf " - $base\n"
done done
@@ -20,6 +21,7 @@ then
for f in $(find /containers/services -mindepth 1 -maxdepth 1 | sort) for f in $(find /containers/services -mindepth 1 -maxdepth 1 | sort)
do do
base="$(basename $f)" base="$(basename $f)"
/bin/mount --bind "$f/rootfs" "$f/rootfs"
log="/var/log/$base.log" 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)" </dev/null 2>$log >$log & /sbin/start-stop-daemon --start --pidfile /run/$base.pid --exec /usr/bin/runc -- run --bundle "$f" --pid-file /run/$base.pid "$(basename $f)" </dev/null 2>$log >$log &
printf " - $base\n" printf " - $base\n"

2
test/ltp/test-ltp.yml
View File

@@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
test/test.yml
View File

@@ -2,7 +2,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935

2
test/virtsock/test-virtsock-server.yml
View File

@@ -6,7 +6,7 @@ kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- mobylinux/init:02f05d99b4eb9cd9223bb5915f4070cf7b67c862 - mobylinux/init:c394f4bf59566206e5036798c058a9894a7e0fc8
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c - mobylinux/containerd:68bb523deea09da293d675cbf88474eced540b8c
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935