From cc57288b64ad238ac2140b3417f72762beeea8de Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Thu, 15 Feb 2018 21:59:53 +0200 Subject: [PATCH 1/2] Add logging to /var/log for onboot containers Signed-off-by: Avi Deitcher --- pkg/init/cmd/service/main.go | 4 +- pkg/init/cmd/service/runc.go | 73 +++++++++++++++++++++++++++++++++--- 2 files changed, 70 insertions(+), 7 deletions(-) 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 } From 6f524eb616db4277d031aa47a3f99d057a46462d Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Fri, 2 Mar 2018 15:51:09 +0200 Subject: [PATCH 2/2] Update hashes for linuxkit/init Signed-off-by: Avi Deitcher --- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/cadvisor.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd-containerd.yml | 2 +- examples/vultr.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/landlock/landlock.yml | 2 +- projects/logging/examples/logging.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- .../linuxkit/vendor/github.com/moby/tool/src/moby/linuxkit.go | 2 +- test/cases/000_build/000_formats/test.yml | 2 +- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/020_kernel/000_config_4.4.x/test.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test.yml | 2 +- test/cases/020_kernel/006_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/007_config_4.15.x/test.yml | 2 +- test/cases/020_kernel/010_kmod_4.4.x/test.yml | 2 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 2 +- test/cases/020_kernel/016_kmod_4.14.x/test.yml | 2 +- test/cases/020_kernel/017_kmod_4.15.x/test.yml | 2 +- test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml | 2 +- test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml | 2 +- .../cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- test/cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../cases/040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../040_packages/006_format_mount/005_by_device_force/test.yml | 2 +- test/cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 2 +- 82 files changed, 82 insertions(+), 82 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index 9594399b8..3264617f2 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 0d2ae268d..405d7116f 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 2ac550d7e..2411dd50b 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 dbbaee41e..a4c9a6ed8 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 ffd434f83..537bae9b8 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 e7cb3c1cd..0179a8ef7 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 37e9d6ac6..2a2d3b4f1 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 0babe4d6d..7d531cfe2 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 9092cc3bf..158abd573 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 792e70f8b..1cb92b67e 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 57da80522..df7816ff4 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 0b999b520..238b60dd0 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 e87bcd3b6..f2318da24 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 d88ab9c23..dcad677fc 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 d0644f8f7..38e0ed7d7 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 c07115227..86a7326fb 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 87d8d3494..13971e5fc 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 c94520bd1..60f633507 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 e7cb3c1cd..0179a8ef7 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 a2eb0f285..670ba3f6e 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 5b7508f84..f11546038 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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/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 d9007431a..6ac6910f8 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 17a9c0d65..5d466e846 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 688fcd187..7be87eefc 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 4fda6df60..aededd2f4 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 81800ac63..e65903587 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 cef13766c..4d36b7a19 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 d8e0a9265..471e7d309 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 c8d1896c6..a2c0c6106 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 cbcf8ff43..28eab961c 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 4d9ce414a..748549cb8 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 4d9ce414a..748549cb8 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 4d9ce414a..748549cb8 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 4d9ce414a..748549cb8 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 384462a7b..768a8820b 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 4d9ce414a..748549cb8 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 6af5fb9e1..c9b6e9685 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 480dbb4da..408137fe0 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.115 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 c0e2a4c43..9a92c6192 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.81 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 e7660a72a..5886953bb 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.19 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 517713f43..171f0dcb7 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.3 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 469f54f42..408cae566 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.115 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 8890206a1..9e15bfdf7 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.81 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 0d345adb6..fad91e107 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.19 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 e45c00e76..17b3544be 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.3 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 205bb853c..ba1e65fca 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.115 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 0334bab82..b5f7f1ec3 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.81 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 1010e9072..e0f362e90 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.19 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 3d8a5ea05..6d82ae26a 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 5ac6cc36a..6e470f6ae 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 8e89dec7f..84278ac83 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 ef82e4872..885b841fd 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 84ced0cb8..786cc23db 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 01438038e..2720dc03a 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 93d6ed1cf..eb334e2f6 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 1469aea56..53912618c 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 72fe23ff1..b30263b3b 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 2b74fd5d0..3c66833f2 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 a6c2a1169..81b4b3190 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 e124a0717..73e9394b4 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 3cd2b1db2..114a39da8 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 30bacd0b8..d5c4f4948 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 95f39e441..61b8b658a 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 1eb3d5fbc..38e87bd67 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 c7a21f344..43116d8a0 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 5c2c5c921..4e7397ae6 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 cf20e35d4..a7f3bd6e7 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 286d3ef45..73910422e 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 399235292..c5f0a4c33 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 03c726919..78f420650 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.81 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 baefdd687..ed70d46b1 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.81 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