diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 7f34f89d6..04e62b08e 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:728e5fe9e6b818d9825b28826b929ae75a386e9e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/aws.yml b/examples/aws.yml index 36b497fdf..7814dc0ba 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/azure.yml b/examples/azure.yml index 98cdefe3b..fe7d4a34b 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 00416e17f..f2fd85098 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/docker.yml b/examples/docker.yml index 063855dc2..8b9a70edb 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/gcp.yml b/examples/gcp.yml index 32e460954..2492af700 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/getty.yml b/examples/getty.yml index babb704f2..0109568c5 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/minimal.yml b/examples/minimal.yml index 3038c9288..72b30459c 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index e3856016d..fc9f2fcf7 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b services: diff --git a/examples/openstack.yml b/examples/openstack.yml index a9d7fb108..891cf91a4 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/packet.yml b/examples/packet.yml index 64bdaa645..66293c4ea 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS1 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index f2c8a3b53..e3e4d71af 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index 9899d6a9e..d3258df98 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/swap.yml b/examples/swap.yml index 80109de44..44b8e026f 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/tpm.yml b/examples/tpm.yml index e040bfc59..0220b4f92 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/vmware.yml b/examples/vmware.yml index 0cd0a9609..0be3a1b3a 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index f6d43e1a0..d80efebc1 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 08ea051c9..eaf510200 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index 32e460954..2492af700 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index c9cce7c06..18cf8237d 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/linuxkit.yml b/linuxkit.yml index 18cb3ba9a..bbed78b67 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/pkg/init/cmd/service/prepare.go b/pkg/init/cmd/service/prepare.go index e3857ed2e..1c852b817 100644 --- a/pkg/init/cmd/service/prepare.go +++ b/pkg/init/cmd/service/prepare.go @@ -4,12 +4,12 @@ import ( "encoding/json" "fmt" "io/ioutil" - "log" "os" "path/filepath" "strings" "github.com/opencontainers/runtime-spec/specs-go" + log "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" "golang.org/x/sys/unix" ) @@ -143,6 +143,7 @@ func prepareFilesystem(path string, runtime Runtime) error { // execute the runtime config that should be done up front // we execute Mounts before Mkdir so you can make a directory under a mount // but we do mkdir of the destination path in case missing + rootfs := filepath.Join(path, "rootfs") for _, mount := range runtime.Mounts { const mode os.FileMode = 0755 err := os.MkdirAll(mount.Destination, mode) @@ -167,6 +168,10 @@ func prepareFilesystem(path string, runtime Runtime) error { for _, dir := range runtime.Mkdir { // in future we may need to change the structure to set mode, ownership const mode os.FileMode = 0755 + // relative paths are relative to rootfs of container + if !filepath.IsAbs(dir) { + dir = filepath.Join(rootfs, dir) + } err := os.MkdirAll(dir, mode) if err != nil { return fmt.Errorf("Cannot create directory %s: %v", dir, err) diff --git a/pkg/init/cmd/service/runc.go b/pkg/init/cmd/service/runc.go index 8e26ea240..4a0f4fe28 100644 --- a/pkg/init/cmd/service/runc.go +++ b/pkg/init/cmd/service/runc.go @@ -2,13 +2,13 @@ package main import ( "io/ioutil" - "log" "os" "os/exec" "path/filepath" "strconv" "github.com/containerd/containerd/sys" + log "github.com/sirupsen/logrus" ) const ( diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 9194d5466..a545835e4 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 7f3016197..108d434a2 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 5c7f7f363..da25fba9d 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index eba764064..89ff9938d 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index e62c11412..c87547ef2 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index bcfb8f4ee..5b4257977 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 # with runc, logwrite, startmemlogd + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd # with runc, logwrite, startmemlogd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 0cef9f240..50de17feb 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 5d7c4e8c2..7b7379c4c 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index a09214436..62ed8fb6a 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index ba0d46ef6..fb19174e0 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,7 +2,7 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 026da8553..90afb7988 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,7 +2,7 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 438f22c4d..526f1bc18 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: dhcpcd diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 81c482e2e..b2174c4cb 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 455050f99..ec729ac43 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 10c7bb19c..4ed287849 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 10c7bb19c..4ed287849 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 10c7bb19c..4ed287849 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 10c7bb19c..4ed287849 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 64b5875c2..2bafb9eba 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml index 10c7bb19c..4ed287849 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 46e06fee7..b3ce88ddf 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b services: diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index d0a3ead75..9de5877e8 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index aee500ac5..f315056e8 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index b4bec59e4..4b668265a 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index 98140fbed..512073437 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: check diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index ff9c69143..8343b42c3 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: check diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index 2a8dfab16..b865dd823 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: check diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index 5b58db2ff..74c5a4f36 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.4.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 trust: org: diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index 49ec8bf85..c3f5d37aa 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 trust: org: diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml index 6c4a53ec2..223d4a159 100644 --- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml +++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 trust: org: diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index c39d9b7b3..75672d6f8 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 72ad6634c..9121c4c57 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 164476a8e..3f97a4dd5 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: binfmt diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 6ca953f00..eee691a9e 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 3bafbb517..76cb0af76 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 61c59391e..ba73e1bf1 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 3e80ecb11..d5d98515b 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 6b827ba00..b0270bbed 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 26cee66dc..6348f2c85 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index b56a0489c..c923d87b8 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 60691d3ba..ddb0c8f57 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 9da79e0bc..c532af445 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: extend diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index a16f57a20..62d182e33 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index a21972ca8..ffd0e8893 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 636c02916..622451209 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 3ed4afcf2..a18de5d98 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: modprobe diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index 37cc719fe..c8bd81945 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index b3a1f4a2f..a87c6b185 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.51 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index 91677a6f7..bc68ff82e 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: format diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 4e09d487f..e42ccf0bb 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.x cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index cd84fc54f..dfcf9f994 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index fc3948f24..e1ab83f3f 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index aedce4db8..fc8253618 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index a73f8dd48..d1612db30 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index d6972c5fc..fe121328e 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 15f58890e..e2eaa1a76 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 13166751a..f9a6e3745 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:4.9.38 cmdline: "console=ttyS0" init: - - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 + - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: test-ns