diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 466213425..1a3479543 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/aws.yml b/examples/aws.yml index be1efd677..167be2fa9 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/azure.yml b/examples/azure.yml index 7a8906ca1..8ea3f8fe1 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index dec9e511a..c1bdfe8a3 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/docker.yml b/examples/docker.yml index 7b3810353..0c47ae342 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/gcp.yml b/examples/gcp.yml index c39244c14..1b08e3845 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/getty.yml b/examples/getty.yml index 861b18b5b..f15b70b16 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 334dab59e..8235cdde8 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/minimal.yml b/examples/minimal.yml index 1c5771a59..b927a0332 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 11127d147..2c64979a4 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a services: diff --git a/examples/openstack.yml b/examples/openstack.yml index bcb330d7d..e15572aed 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/packet.yml b/examples/packet.yml index e9eaad137..00842b821 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index fb3976a6c..420a175b8 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index 6af1b6e15..b1c8fb50f 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/swap.yml b/examples/swap.yml index 89586b96b..d774be4e4 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/tpm.yml b/examples/tpm.yml index 844f432e3..0fc41cd13 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/vmware.yml b/examples/vmware.yml index 4004e31af..82f4534f1 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 09bc346e9..f5abbcfb2 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a onboot: diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 38a809b7d..77b6d876f 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index c39244c14..1b08e3845 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 2318be5c5..6b6fb5f75 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/linuxkit.yml b/linuxkit.yml index d62ce0291..77e800d15 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/pkg/init/cmd/service/prepare.go b/pkg/init/cmd/service/prepare.go index ca2f82632..b8c97e9bf 100644 --- a/pkg/init/cmd/service/prepare.go +++ b/pkg/init/cmd/service/prepare.go @@ -23,6 +23,7 @@ type Runtime struct { Mkdir []string `yaml:"mkdir" json:"mkdir,omitempty"` Interfaces []Interface `yaml:"interfaces" json:"interfaces,omitempty"` BindNS Namespaces `yaml:"bindNS" json:"bindNS,omitempty"` + Namespace string `yaml:"namespace,omitempty" json:"namespace,omitempty"` } // Namespaces is the type for configuring paths to bind namespaces diff --git a/pkg/init/cmd/service/start.go b/pkg/init/cmd/service/start.go index d4964ba1e..0e0341846 100644 --- a/pkg/init/cmd/service/start.go +++ b/pkg/init/cmd/service/start.go @@ -11,6 +11,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" + "github.com/containerd/containerd/namespaces" specs "github.com/opencontainers/runtime-spec/specs-go" log "github.com/sirupsen/logrus" ) @@ -113,6 +114,10 @@ func start(ctx context.Context, service, sock, basePath, dumpSpec string) (strin } + if runtimeConfig.Namespace != "" { + ctx = namespaces.WithNamespace(ctx, runtimeConfig.Namespace) + } + ctr, err := client.NewContainer(ctx, service, containerd.WithSpec(spec)) if err != nil { return "", 0, "failed to create container", err diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 609f9dbf3..265267662 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 0261bcb11..b1734c114 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 2ff0943ac..e8b7783d0 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 370e0008e..0a5bbcc55 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index eb8d3955e..a2a423118 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - 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 71bcce098..1ef98fbc6 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 # with runc, logwrite, startmemlogd + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 # with runc, logwrite, startmemlogd - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 30b5b1d75..6659b1cca 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 83a532969..75cd93931 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index da2a2659f..7d09adc07 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.77 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 757ead815..0e7682aa4 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 1a41e63c1..c9c19aa60 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/src/cmd/linuxkit/vendor.conf b/src/cmd/linuxkit/vendor.conf index 2c3499be8..ebac3d40a 100644 --- a/src/cmd/linuxkit/vendor.conf +++ b/src/cmd/linuxkit/vendor.conf @@ -26,7 +26,7 @@ github.com/moby/datakit 97b3d230535397a813323902c23751e176481a86 github.com/moby/hyperkit a12cd7250bcd8d689078e3e42ae4a7cf6a0cbaf3 # When updating also: # curl -fsSL -o src/cmd/linuxkit/build.go https://raw.githubusercontent.com/moby/tool/«hash»/cmd/moby/build.go -github.com/moby/tool 57b6e2ab947104d47fd60e5af0e34d0edeb9421c +github.com/moby/tool caca03c097eafd7aa1e011de59ded3604e1b318f github.com/moby/vpnkit 0e4293bb1058598c4b0a406ed171f52573ef414c github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448 github.com/opencontainers/image-spec v1.0.0 diff --git a/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/README.md b/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/README.md new file mode 100644 index 000000000..9e588db25 --- /dev/null +++ b/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/README.md @@ -0,0 +1,60 @@ +## About + +This directory contains a collection of scripts used to build and manage this +repository. If there are any issues regarding the intention of a particular +script (or even part of a certain script), please reach out to us. +It may help us either refine our current scripts, or add on new ones +that are appropriate for a given use case. + +## DinD (dind.sh) + +DinD is a wrapper script which allows Docker to be run inside a Docker +container. DinD requires the container to +be run with privileged mode enabled. + +## Generate Authors (generate-authors.sh) + +Generates AUTHORS; a file with all the names and corresponding emails of +individual contributors. AUTHORS can be found in the home directory of +this repository. + +## Make + +There are two make files, each with different extensions. Neither are supposed +to be called directly; only invoke `make`. Both scripts run inside a Docker +container. + +### make.ps1 + +- The Windows native build script that uses PowerShell semantics; it is limited +unlike `hack\make.sh` since it does not provide support for the full set of +operations provided by the Linux counterpart, `make.sh`. However, `make.ps1` +does provide support for local Windows development and Windows to Windows CI. +More information is found within `make.ps1` by the author, @jhowardmsft + +### make.sh + +- Referenced via `make test` when running tests on a local machine, +or directly referenced when running tests inside a Docker development container. +- When running on a local machine, `make test` to run all tests found in +`test`, `test-unit`, `test-integration`, and `test-docker-py` on +your local machine. The default timeout is set in `make.sh` to 60 minutes +(`${TIMEOUT:=60m}`), since it currently takes up to an hour to run +all of the tests. +- When running inside a Docker development container, `hack/make.sh` does +not have a single target that runs all the tests. You need to provide a +single command line with multiple targets that performs the same thing. +An example referenced from [Run targets inside a development container](https://docs.docker.com/opensource/project/test-and-docs/#run-targets-inside-a-development-container): `root@5f8630b873fe:/go/src/github.com/moby/moby# hack/make.sh dynbinary binary cross test-unit test-integration test-docker-py` +- For more information related to testing outside the scope of this README, +refer to +[Run tests and test documentation](https://docs.docker.com/opensource/project/test-and-docs/) + +## Release (release.sh) + +Releases any bundles built by `make` on a public AWS S3 bucket. +For information regarding configuration, please view `release.sh`. + +## Vendor (vendor.sh) + +A shell script that is a wrapper around Vndr. For information on how to use +this, please refer to [vndr's README](https://github.com/LK4D4/vndr/blob/master/README.md) diff --git a/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/README.md b/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/README.md new file mode 100644 index 000000000..1cea52526 --- /dev/null +++ b/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/README.md @@ -0,0 +1,69 @@ +# Integration Testing on Swarm + +IT on Swarm allows you to execute integration test in parallel across a Docker Swarm cluster + +## Architecture + +### Master service + + - Works as a funker caller + - Calls a worker funker (`-worker-service`) with a chunk of `-check.f` filter strings (passed as a file via `-input` flag, typically `/mnt/input`) + +### Worker service + + - Works as a funker callee + - Executes an equivalent of `TESTFLAGS=-check.f TestFoo|TestBar|TestBaz ... make test-integration-cli` using the bind-mounted API socket (`docker.sock`) + +### Client + + - Controls master and workers via `docker stack` + - No need to have a local daemon + +Typically, the master and workers are supposed to be running on a cloud environment, +while the client is supposed to be running on a laptop, e.g. Docker for Mac/Windows. + +## Requirement + + - Docker daemon 1.13 or later + - Private registry for distributed execution with multiple nodes + +## Usage + +### Step 1: Prepare images + + $ make build-integration-cli-on-swarm + +Following environment variables are known to work in this step: + + - `BUILDFLAGS` + - `DOCKER_INCREMENTAL_BINARY` + +Note: during the transition into Moby Project, you might need to create a symbolic link `$GOPATH/src/github.com/docker/docker` to `$GOPATH/src/github.com/moby/moby`. + +### Step 2: Execute tests + + $ ./hack/integration-cli-on-swarm/integration-cli-on-swarm -replicas 40 -push-worker-image YOUR_REGISTRY.EXAMPLE.COM/integration-cli-worker:latest + +Following environment variables are known to work in this step: + + - `DOCKER_GRAPHDRIVER` + - `DOCKER_EXPERIMENTAL` + +#### Flags + +Basic flags: + + - `-replicas N`: the number of worker service replicas. i.e. degree of parallelism. + - `-chunks N`: the number of chunks. By default, `chunks` == `replicas`. + - `-push-worker-image REGISTRY/IMAGE:TAG`: push the worker image to the registry. Note that if you have only single node and hence you do not need a private registry, you do not need to specify `-push-worker-image`. + +Experimental flags for mitigating makespan nonuniformity: + + - `-shuffle`: Shuffle the test filter strings + +Flags for debugging IT on Swarm itself: + + - `-rand-seed N`: the random seed. This flag is useful for deterministic replaying. By default(0), the timestamp is used. + - `-filters-file FILE`: the file contains `-check.f` strings. By default, the file is automatically generated. + - `-dry-run`: skip the actual workload + - `keep-executor`: do not auto-remove executor containers, which is used for running privileged programs on Swarm diff --git a/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/agent/vendor.conf b/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/agent/vendor.conf new file mode 100644 index 000000000..efd6d6d04 --- /dev/null +++ b/src/cmd/linuxkit/vendor/github.com/docker/docker/hack/integration-cli-on-swarm/agent/vendor.conf @@ -0,0 +1,2 @@ +# dependencies specific to worker (i.e. github.com/docker/docker/...) are not vendored here +github.com/bfirsh/funker-go eaa0a2e06f30e72c9a0b7f858951e581e26ef773 diff --git a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/config.go b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/config.go index fc1107d5a..ef41abbf7 100644 --- a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/config.go +++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/config.go @@ -70,6 +70,7 @@ type Image struct { // ImageConfig is the configuration part of Image, it is the subset // which is valid in a "org.mobyproject.config" label on an image. +// Everything except Runtime and ref is used to build the OCI spec type ImageConfig struct { Capabilities *[]string `yaml:"capabilities,omitempty" json:"capabilities,omitempty"` Ambient *[]string `yaml:"ambient,omitempty" json:"ambient,omitempty"` @@ -100,7 +101,9 @@ type ImageConfig struct { Rlimits *[]string `yaml:"rlimits,omitempty" json:"rlimits,omitempty"` UIDMappings *[]specs.LinuxIDMapping `yaml:"uidMappings,omitempty" json:"uidMappings,omitempty"` GIDMappings *[]specs.LinuxIDMapping `yaml:"gidMappings,omitempty" json:"gidMappings,omitempty"` - Runtime *Runtime `yaml:"runtime,omitempty" json:"runtime,omitempty"` + Annotations *map[string]string `yaml:"annotations,omitempty" json:"annotations,omitempty"` + + Runtime *Runtime `yaml:"runtime,omitempty" json:"runtime,omitempty"` ref *reference.Spec } @@ -112,6 +115,7 @@ type Runtime struct { Mkdir *[]string `yaml:"mkdir,omitempty" json:"mkdir,omitempty"` Interfaces *[]Interface `yaml:"interfaces,omitempty,omitempty" json:"interfaces,omitempty"` BindNS Namespaces `yaml:"bindNS,omitempty" json:"bindNS,omitempty"` + Namespace *string `yaml:"namespace,omitempty" json:"namespace,omitempty"` } // Namespaces is the type for configuring paths to bind namespaces @@ -585,6 +589,7 @@ func assignRuntime(v1, v2 *Runtime) Runtime { runtimeMounts := assignBinds(v1.Mounts, v2.Mounts) runtimeMkdir := assignStrings(v1.Mkdir, v2.Mkdir) runtimeInterfaces := assignRuntimeInterfaceArray(v1.Interfaces, v2.Interfaces) + runtimeNamespace := assignString(v1.Namespace, v2.Namespace) runtime := Runtime{ Cgroups: &runtimeCgroups, Mounts: &runtimeMounts, @@ -599,6 +604,7 @@ func assignRuntime(v1, v2 *Runtime) Runtime { User: assignStringPtr(v1.BindNS.User, v2.BindNS.User), Uts: assignStringPtr(v1.BindNS.Uts, v2.BindNS.Uts), }, + Namespace: &runtimeNamespace, } return runtime } @@ -1025,6 +1031,7 @@ func ConfigInspectToOCI(yaml *Image, inspect types.ImageInspect, idMap map[strin oci.Hostname = assignStringEmpty(label.Hostname, yaml.Hostname) oci.Mounts = mountList + oci.Annotations = assignMaps(label.Annotations, yaml.Annotations) resources := assignResources(label.Resources, yaml.Resources) diff --git a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/schema.go b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/schema.go index 7c2771214..9379098f4 100644 --- a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/schema.go +++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/schema.go @@ -49,6 +49,10 @@ var schema = string(` "type": "array", "items": {"type": "string"} }, + "mapstring": { + "type": "object", + "additionalProperties": {"type": "string"} + }, "mount": { "type": "object", "additionalProperties": false, @@ -244,7 +248,8 @@ var schema = string(` "mounts": {"$ref": "#/definitions/mounts"}, "mkdir": {"$ref": "#/definitions/strings"}, "interfaces": {"$ref": "#/definitions/interfaces"}, - "bindNS": {"$ref": "#/definitions/namespaces"} + "bindNS": {"$ref": "#/definitions/namespaces"}, + "namespace": {"type": "string"} } }, "image": { @@ -282,13 +287,11 @@ var schema = string(` "rootfsPropagation": {"type": "string"}, "cgroupsPath": {"type": "string"}, "resources": {"$ref": "#/definitions/resources"}, - "sysctl": { - "type": "array", - "items": { "$ref": "#/definitions/strings" } - }, + "sysctl": { "$ref": "#/definitions/mapstring" }, "rlimits": { "$ref": "#/definitions/strings" }, "uidMappings": { "$ref": "#/definitions/idmappings" }, "gidMappings": { "$ref": "#/definitions/idmappings" }, + "annotations": { "$ref": "#/definitions/mapstring" }, "runtime": {"$ref": "#/definitions/runtime"} } }, diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index a87af5d31..44eddefe4 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 a577febf6..9b52fec7d 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 79bfadcc7..5972a658c 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 0e7f48e64..e034baa75 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 0e7f48e64..e034baa75 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 0e7f48e64..e034baa75 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 0e7f48e64..e034baa75 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 e86be1952..035db3f6e 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 0e7f48e64..e034baa75 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 1d06ae269..ffea16423 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a 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 e5763785a..79885c392 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.112 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 ad14c3596..459554007 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 4b99c5d00..59b7e078a 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.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 76200cbf4..83cf816b2 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.112 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 eeecf5612..06f6697a6 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 8350f12e2..4a02cefd7 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.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 e8564ab4b..3ce605f4f 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.112 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 f724a342d..54488b297 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 cc2b60a11..878338a69 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.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 4a7854ba2..ab0e03e31 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.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - 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 177f77d39..521e03bdd 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.77 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 47a3d0358..064ae6e23 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 cb0a69c0d..d4c769c59 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - 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 6f6b031ce..e4b87436e 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - 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 784c98510..6643fd5ff 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 d9fe1d9a2..b6ce60472 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 066e80e7f..269de7dc8 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 c5e8d11e4..70e2b066d 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 8e1309209..c55207401 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 d1c3cca76..82f46335d 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 a3e9c7534..54633ad3f 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 f185ed1c0..07837cd4a 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 0a1c0664f..e29439bc4 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 25895141a..cad99a1f4 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 8dbac0c90..96d3e57de 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 b1132ee9b..44a8164ab 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 a1971e454..f7612aeb7 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 d8c913fb0..61fab7aed 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff 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 193da2103..be1c66529 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - 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 c60189c5e..51cc9fc72 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index cee02780e..83bf71ba2 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index b6fa86a6c..bed2d0046 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 41d09f544..edaf60f02 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.77 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 1c602169c..8f92e34c2 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 7237fe15f..bcaedaa6d 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.77 cmdline: "console=ttyS0" init: - - linuxkit/init:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff - linuxkit/containerd:78706a05d00a7385ff2b6b7db280041338e4b34a onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 68c3782c4..6ea626aaf 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:372329736f90cafad41008b5b8f1e7d957e5e6a0 + - linuxkit/init:be8756f0a6005279d2409a8790b4dd8b2ac11df9 - linuxkit/runc:7b15b00b4e3507d62e3ed8d44dfe650561cd35ff onboot: - name: test-ns