diff --git a/contrib/crosvm/README.md b/contrib/crosvm/README.md index 33450afcf..b9df46c4b 100644 --- a/contrib/crosvm/README.md +++ b/contrib/crosvm/README.md @@ -33,7 +33,7 @@ kernel: image: linuxkit/kernel:4.9.91 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f services: diff --git a/examples/aws.yml b/examples/aws.yml index e3795ef74..5822da35a 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/azure.yml b/examples/azure.yml index 4ab7e3f7d..7088d6a75 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 26f52acd4..c7490e216 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 0ec23a162..7e6a7e774 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:v0.4 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/docker.yml b/examples/docker.yml index 05aa6c54c..f2e598cb7 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/gcp.yml b/examples/gcp.yml index 83df90bdf..a430c571b 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/getty.yml b/examples/getty.yml index f867eae08..125a7de5c 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 951d76a74..0a896fdea 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 1e9befd9a..b44c85558 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/minimal.yml b/examples/minimal.yml index 08900dd03..4e2b66c60 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 0f64f3196..25606ba11 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f services: diff --git a/examples/openstack.yml b/examples/openstack.yml index 933d3d0fa..37fbdb105 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/packet.yml b/examples/packet.yml index c7fc6462f..3dcd8fd24 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 62bbd2c7d..a009e3b44 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index 203b366e7..cf762fba1 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.40-rt cmdline: "console=tty0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/sshd.yml b/examples/sshd.yml index 72656d9d1..c2d8373e0 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/swap.yml b/examples/swap.yml index cf9cf98a9..0a6ed188c 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/tpm.yml b/examples/tpm.yml index 913761abf..93baa17ea 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/vmware.yml b/examples/vmware.yml index a923f42ba..cb270597e 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 323e58fc3..16df95304 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index ab6ffb1e5..d05c46dbc 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index 83df90bdf..a430c571b 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 06aa15e4e..b1aeed22b 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/linuxkit.yml b/linuxkit.yml index 7a44e459b..aa996a6d9 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/pkg/init/cmd/service/start.go b/pkg/init/cmd/service/cmd.go similarity index 66% rename from pkg/init/cmd/service/start.go rename to pkg/init/cmd/service/cmd.go index 0e0341846..c5b9b6364 100644 --- a/pkg/init/cmd/service/start.go +++ b/pkg/init/cmd/service/cmd.go @@ -16,11 +16,11 @@ import ( log "github.com/sirupsen/logrus" ) -func startCmd(ctx context.Context, args []string) { +func parseCmd(ctx context.Context, command string, args []string) (*log.Entry, string, string, string, string) { invoked := filepath.Base(os.Args[0]) - flags := flag.NewFlagSet("start", flag.ExitOnError) + flags := flag.NewFlagSet(command, flag.ExitOnError) flags.Usage = func() { - fmt.Printf("USAGE: %s start [service]\n\n", invoked) + fmt.Printf("USAGE: %s %s [service]\n\n", invoked, command) fmt.Printf("Options:\n") flags.PrintDefaults() } @@ -43,12 +43,30 @@ func startCmd(ctx context.Context, args []string) { service := args[0] - log.Infof("Starting service: %q", service) log := log.WithFields(log.Fields{ "service": service, }) - id, pid, msg, err := start(ctx, service, *sock, *path, *dumpSpec) + return log, service, *sock, *path, *dumpSpec +} + +func stopCmd(ctx context.Context, args []string) { + log, service, sock, path, _ := parseCmd(ctx, "stop", args) + + log.Infof("Stopping service: %q", service) + id, pid, msg, err := stop(ctx, service, sock, path) + if err != nil { + log.WithError(err).Fatal(msg) + } + + log.Debugf("Stopped %s pid %d", id, pid) +} + +func startCmd(ctx context.Context, args []string) { + log, service, sock, path, dumpSpec := parseCmd(ctx, "start", args) + + log.Infof("Starting service: %q", service) + id, pid, msg, err := start(ctx, service, sock, path, dumpSpec) if err != nil { log.WithError(err).Fatal(msg) } @@ -56,6 +74,14 @@ func startCmd(ctx context.Context, args []string) { log.Debugf("Started %s pid %d", id, pid) } +func restartCmd(ctx context.Context, args []string) { + // validate arguments with the command as "restart" + parseCmd(ctx, "restart", args) + + stopCmd(ctx, args) + startCmd(ctx, args) +} + type logio struct { config cio.Config } @@ -74,6 +100,56 @@ func (c *logio) Close() error { return nil } +func stop(ctx context.Context, service, sock, basePath string) (string, uint32, string, error) { + path := filepath.Join(basePath, service) + + runtimeConfig := getRuntimeConfig(path) + + client, err := containerd.New(sock) + if err != nil { + return "", 0, "creating containerd client", err + } + + if runtimeConfig.Namespace != "" { + ctx = namespaces.WithNamespace(ctx, runtimeConfig.Namespace) + } + + ctr, err := client.LoadContainer(ctx, service) + if err != nil { + return "", 0, "loading container", err + } + + task, err := ctr.Task(ctx, nil) + if err != nil { + return "", 0, "fetching task", err + } + + id := ctr.ID() + pid := task.Pid() + + err = task.Kill(ctx, 9) + if err != nil { + return "", 0, "killing task", err + } + + _, err = task.Wait(ctx) + if err != nil { + return "", 0, "waiting for task to exit", err + } + + _, err = task.Delete(ctx) + if err != nil { + return "", 0, "deleting task", err + } + + err = ctr.Delete(ctx) + if err != nil { + return "", 0, "deleting container", err + } + + return id, pid, "", nil +} + func start(ctx context.Context, service, sock, basePath, dumpSpec string) (string, uint32, string, error) { path := filepath.Join(basePath, service) diff --git a/pkg/init/cmd/service/main.go b/pkg/init/cmd/service/main.go index d4816980c..1c03e3e13 100644 --- a/pkg/init/cmd/service/main.go +++ b/pkg/init/cmd/service/main.go @@ -43,7 +43,9 @@ func main() { fmt.Printf("USAGE: %s [options] COMMAND\n\n", filepath.Base(os.Args[0])) fmt.Printf("Commands:\n") fmt.Printf(" system-init Prepare the system at start of day\n") + fmt.Printf(" stop Stop a service\n") fmt.Printf(" start Start a service\n") + fmt.Printf(" restart Restart a service\n") fmt.Printf(" help Print this message\n") fmt.Printf("\n") fmt.Printf("Run '%s COMMAND --help' for more information on the command\n", filepath.Base(os.Args[0])) @@ -92,9 +94,18 @@ func main() { } } + if len(args) < 1 { + flag.Usage() + os.Exit(1) + } + switch args[0] { + case "stop": + stopCmd(ctx, args[1:]) case "start": startCmd(ctx, args[1:]) + case "restart": + restartCmd(ctx, args[1:]) case "system-init": systemInitCmd(ctx, args[1:]) default: diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 3d547be6a..4d73310ad 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 6d4462aaa..211f42c3c 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index e95503e54..c41e42d95 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index c822dbace..fc09fde52 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index ad55fb8b4..971f9db1f 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - 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 4911a098d..8f828c275 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 6a2a54eda..5c32bddc3 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" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index b0bf07cc4..d78f200f2 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 6d39dbf56..51989fbcb 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 234bddd1a..8514dce72 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index ac7d166f3..1fbd90f8f 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index ec6e3516a..f8e6249eb 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: dhcpcd diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index 1d3c8d1a6..268781ce0 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index 1d3c8d1a6..268781ce0 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 f89d4b4fd..5851179c9 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 59c76eb6e..84161bad5 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 59c76eb6e..84161bad5 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 59c76eb6e..84161bad5 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 59c76eb6e..84161bad5 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 2966e4b74..7437cea0c 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 59c76eb6e..84161bad5 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 59c76eb6e..84161bad5 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 6a98af6b1..45b46b643 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f 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 ccfb74479..27fd946e7 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.136 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 32b95af98..26eaf896d 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.107 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 ce1e3f82e..11bf04715 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.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/008_config_4.16.x/test.yml b/test/cases/020_kernel/008_config_4.16.x/test.yml index 302458e96..c37cf0ab8 100644 --- a/test/cases/020_kernel/008_config_4.16.x/test.yml +++ b/test/cases/020_kernel/008_config_4.16.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.16.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/009_config_4.17.x/test.yml b/test/cases/020_kernel/009_config_4.17.x/test.yml index 3415d9ccf..54215aac5 100644 --- a/test/cases/020_kernel/009_config_4.17.x/test.yml +++ b/test/cases/020_kernel/009_config_4.17.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.17 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 5d5354fec..4d84827a5 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.136 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 14aaf0837..28fc9f659 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.107 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 a9c265e32..a044a9092 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.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/018_kmod_4.16.x/test.yml b/test/cases/020_kernel/018_kmod_4.16.x/test.yml index df6979e5c..05d811e89 100644 --- a/test/cases/020_kernel/018_kmod_4.16.x/test.yml +++ b/test/cases/020_kernel/018_kmod_4.16.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.16.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/019_kmod_4.17.x/test.yml b/test/cases/020_kernel/019_kmod_4.17.x/test.yml index 1b8e26583..af1f121f6 100644 --- a/test/cases/020_kernel/019_kmod_4.17.x/test.yml +++ b/test/cases/020_kernel/019_kmod_4.17.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.17 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:a14b7ef6115e6d56fe5bf7c40517b9e190dd4dfb + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: check diff --git a/test/cases/020_kernel/110_namespace/common.yml b/test/cases/020_kernel/110_namespace/common.yml index 335a0ab29..7c1351b67 100644 --- a/test/cases/020_kernel/110_namespace/common.yml +++ b/test/cases/020_kernel/110_namespace/common.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 bdb938ee0..75b99b878 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.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index c30bf1b2a..b50278b81 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.14.48 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 48c73ecaa..9bb1bcc75 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 fd0910f25..07f76ba3d 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/ca-certificates:v0.4 onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 3aa74542f..ad44fa8df 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 1d1d8b1c2..b38acace6 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 edd664c17..99a315020 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 260e4c11e..bf80dc128 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 55672132e..c008295e2 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 d7b971cf4..c162abc9b 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 06124f5a5..a10a6aac9 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 70410d73a..121d76d78 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 d958cab18..81b210338 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 5adf45bb3..2da6b7a7f 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 2ae3b941b..3d0a0ca52 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 fbac836b1..5acbe7094 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 c6a8d4182..c7922c264 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 b9e31f944..46546ad9f 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 25e8136de..8015cf15b 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 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 849fa7fe4..8170b9012 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index d13253534..3047cdb45 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 0a6e7a8a9..7137c7627 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 42b851661..28e15471b 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 10523a1f6..b47b7307b 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.14.48 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f - linuxkit/ca-certificates:v0.4 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index a84b51e2f..a0097ea19 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 8d5f60643..c5dbe72db 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.14.48 cmdline: "console=ttyS0" init: - - linuxkit/init:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 - linuxkit/containerd:72df922e49a363a4ad53d88cd1a8a3ae4d41086f onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 8918f786b..bc3ea9eb8 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:fbcbbe3ace0b3e9455300017dd07625293a0d4d4 + - linuxkit/init:eca81db9b072eb431c057bab77797e169295fa1e - linuxkit/runc:v0.4 onboot: - name: test-ns