diff --git a/examples/aws.yml b/examples/aws.yml index 79e04564c..8048d94fb 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/azure.yml b/examples/azure.yml index ad0da14ca..7e713ae8c 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 3e9ea0815..292ad075c 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 2df5efd1c..7fa73c2cd 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.2 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/docker.yml b/examples/docker.yml index 020100e3c..1daf48a71 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/gcp.yml b/examples/gcp.yml index c0205d55b..573dbd948 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/getty.yml b/examples/getty.yml index 72a0757c9..1b0666d95 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 2e7b11311..c0a9192a9 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/minimal.yml b/examples/minimal.yml index c8742514e..654e8cef7 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index f6b4968ab..365359e45 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 services: diff --git a/examples/openstack.yml b/examples/openstack.yml index 42477f735..851827cce 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/packet.yml b/examples/packet.yml index 2d4652831..b74d57a65 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 03a8b9d6e..2a515ef9c 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index e5e166f0c..cdaaeb049 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/swap.yml b/examples/swap.yml index 77fb26a41..5f309a479 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/tpm.yml b/examples/tpm.yml index f6d4231f4..f2084b8d6 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/vmware.yml b/examples/vmware.yml index 820e27037..d776ddda4 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 61770fd28..107fd0c20 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 255cb8d63..cb19a4b1a 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index c0205d55b..573dbd948 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 1f0317a21..25e9df89d 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/linuxkit.yml b/linuxkit.yml index d77457b44..4fb0fa6ab 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/pkg/init/cmd/service/main.go b/pkg/init/cmd/service/main.go index 160266682..d4816980c 100644 --- a/pkg/init/cmd/service/main.go +++ b/pkg/init/cmd/service/main.go @@ -83,9 +83,9 @@ func main() { command := os.Args[0] switch { case strings.Contains(command, "onboot"): - os.Exit(runcInit(onbootPath)) + os.Exit(runcInit(onbootPath, "onboot")) case strings.Contains(command, "onshutdown"): - os.Exit(runcInit(shutdownPath)) + os.Exit(runcInit(shutdownPath, "shutdown")) case strings.Contains(command, "containerd"): systemInitCmd(ctx, []string{}) os.Exit(0) diff --git a/pkg/init/cmd/service/runc.go b/pkg/init/cmd/service/runc.go index 4a0f4fe28..ba242129f 100644 --- a/pkg/init/cmd/service/runc.go +++ b/pkg/init/cmd/service/runc.go @@ -1,9 +1,11 @@ package main import ( + "io" "io/ioutil" "os" "os/exec" + "path" "path/filepath" "strconv" @@ -13,9 +15,23 @@ import ( const ( runcBinary = "/usr/bin/runc" + logDirBase = "/run/log/" + varLogDir = "/var/log" ) -func runcInit(rootPath string) int { +func dumpFile(w io.Writer, filePath string) error { + f, err := os.OpenFile(filePath, os.O_RDONLY, 0644) + if err != nil { + return err + } + defer f.Close() + + _, err = io.Copy(w, f) + + return err +} + +func runcInit(rootPath, serviceType string) int { // do nothing if the path does not exist if _, err := os.Stat(rootPath); err != nil && os.IsNotExist(err) { return 0 @@ -39,6 +55,13 @@ func runcInit(rootPath string) int { status := 0 + logDir := path.Join(logDirBase, serviceType) + varLogLink := path.Join(varLogDir, serviceType) + + if err := os.MkdirAll(logDir, 0755); err != nil { + log.Fatalf("Cannot create log directory %s: %v", logDir, err) + } + for _, file := range files { name := file.Name() path := filepath.Join(rootPath, name) @@ -52,8 +75,32 @@ func runcInit(rootPath string) int { } pidfile := filepath.Join(tmpdir, name) cmd := exec.Command(runcBinary, "create", "--bundle", path, "--pid-file", pidfile, name) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr + + // stream stdout and stderr to respective files + // ideally we want to use io.MultiWriter here, sending one stream to stdout/stderr, another to the files + // however, this hangs if we do, due to a runc bug, see https://github.com/opencontainers/runc/issues/1721#issuecomment-366315563 + // once that is fixed, this can be cleaned up + stdoutFile := filepath.Join(logDir, serviceType+"."+name+".out.log") + stdout, err := os.OpenFile(stdoutFile, os.O_WRONLY|os.O_CREATE, 0644) + if err != nil { + log.Printf("Error opening stdout log file: %v", err) + status = 1 + continue + } + defer stdout.Close() + + stderrFile := filepath.Join(logDir, serviceType+"."+name+".err.log") + stderr, err := os.OpenFile(stderrFile, os.O_WRONLY|os.O_CREATE, 0644) + if err != nil { + log.Printf("Error opening stderr log file: %v", err) + status = 1 + continue + } + defer stderr.Close() + + cmd.Stdout = stdout + cmd.Stderr = stderr + if err := cmd.Run(); err != nil { log.Printf("Error creating %s: %v", name, err) status = 1 @@ -91,8 +138,9 @@ func runcInit(rootPath string) int { }() cmd = exec.Command(runcBinary, "start", name) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr + cmd.Stdout = stdout + cmd.Stderr = stderr + if err := cmd.Run(); err != nil { log.Printf("Error starting %s: %v", name, err) status = 1 @@ -103,9 +151,24 @@ func runcInit(rootPath string) int { cleanup(path) _ = os.Remove(pidfile) + + // dump the log file outputs to os.Stdout/os.Stderr + if err = dumpFile(os.Stdout, stdoutFile); err != nil { + log.Printf("Error writing stdout of onboot service %s to console: %v", name, err) + } + if err = dumpFile(os.Stderr, stderrFile); err != nil { + log.Printf("Error writing stderr of onboot service %s to console: %v", name, err) + } } _ = os.RemoveAll(tmpdir) + // make sure the link exists from /var/log/onboot -> /run/log/onboot + if err := os.MkdirAll(varLogDir, 0755); err != nil { + log.Printf("Error creating secondary log directory %s: %v", varLogDir, err) + } else if err := os.Symlink(logDir, varLogLink); err != nil && !os.IsExist(err) { + log.Printf("Error creating symlink from %s to %s: %v", varLogLink, logDir, err) + } + return status } diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 56926d8e7..61d028119 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 3e926fd0b..970c6f96d 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 5b186585d..e188e132a 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 198a4fa1f..c1d94006f 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index db0ea95bc..9d3e39ab6 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - 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 1b8d2f1be..39829b8b7 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 # with runc, logwrite, startmemlogd + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a # with runc, logwrite, startmemlogd - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 169b7a39c..3d7e8936f 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 4fd429dfa..5760d81db 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 794c7bfe3..45edfaa6e 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.23 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 36e2f3fa9..49c34143f 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index c9867c722..c69a0d838 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go index 0d853982c..7425be6dd 100644 --- a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go +++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go @@ -17,7 +17,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:00ab58c9681a0bf42b2e35134c1ccf1591ebb64d + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index f8ac473e6..984f59172 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 e74c34514..85c6d8f3b 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.14.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 d472ad64f..9b4b5e5f0 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 38fd88e97..1d9271d61 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 38fd88e97..1d9271d61 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 38fd88e97..1d9271d61 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 38fd88e97..1d9271d61 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 c80318b69..060e5205e 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 38fd88e97..1d9271d61 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.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 b85ebb3ac..5a3fe7d24 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 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 434b4d5bb..031e35be9 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.119 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 92ab9f32f..115f1e62c 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.85 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 aa3b222a2..01b4b5a55 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/007_config_4.15.x/test.yml b/test/cases/020_kernel/007_config_4.15.x/test.yml index c432849b9..529a8ef59 100644 --- a/test/cases/020_kernel/007_config_4.15.x/test.yml +++ b/test/cases/020_kernel/007_config_4.15.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.15.7 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 fb983dcb7..d2ed4bfa9 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.119 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 cafcfcedc..d699b1eec 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.85 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 3187c0e47..b4b3342ae 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 onboot: - name: check diff --git a/test/cases/020_kernel/017_kmod_4.15.x/test.yml b/test/cases/020_kernel/017_kmod_4.15.x/test.yml index f9f5eebbd..686d25044 100644 --- a/test/cases/020_kernel/017_kmod_4.15.x/test.yml +++ b/test/cases/020_kernel/017_kmod_4.15.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.15.7 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 b619ba6aa..153e5d450 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.119 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 78a4b6b0f..f5f79e78e 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.85 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 88e149fe4..930dd5adc 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 7f5b8dd38..9be4973c8 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.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 8d70645e5..f8dc83369 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.23 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 9c2b29e54..634460de2 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 7cb902d05..681e4b9e8 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/ca-certificates:v0.2 onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 387027103..3b99f51d0 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index a2fefc93f..be0a67271 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 229cfda63..3d732ac8d 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 7088c0179..44d21285b 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 c6afc5eaf..5f11c0fd9 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 fd642ec3d..e106c5b48 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 dfa85ce38..29ef6e62c 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 4accdf1cf..99c82690c 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 66def5469..1a5a695dc 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 c045f93b2..60a0376a3 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 6712d6bde..f61ed1641 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 f583e6aa6..93ca2d333 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 ef522c181..9b3d8b900 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 30f19e1b2..ad7c01b85 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 4b6c60d89..9e5d019e8 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 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 2e955aa0b..702bc5b88 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 2d0ef099a..99008c70d 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 4a3de2c3d..0e3f0688d 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index c5c019532..fd55a9689 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 4ea003b1c..b5c44466b 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.23 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 - linuxkit/ca-certificates:v0.2 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 585d5bf19..b8bc65aff 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 6d1479b7f..38d47db12 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.14.23 cmdline: "console=ttyS0" init: - - linuxkit/init:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 - linuxkit/containerd:37e397ebfc6bd5d8e18695b121166ffd0cbfd9f0 onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 592f8fa5a..db4acd687 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:d899eee3560a40aa3b4bdd67b3bb82703714b2b9 + - linuxkit/init:b212cfeb4bb6330e0a7547d8010fe2e8489b677a - linuxkit/runc:7c39a68490a12cde830e1922f171c451fb08e731 onboot: - name: test-ns