From 5201049f2ccb92d3933ab39f1a1a498c09dda669 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 13 Jul 2018 10:47:05 +0100 Subject: [PATCH 1/5] pkg/init: write stderr to rather than .err This will then be written to disk as .log by logwrite. Part of #3111 Signed-off-by: David Scott --- pkg/init/cmd/service/cmd.go | 2 +- pkg/init/cmd/service/runc.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/init/cmd/service/cmd.go b/pkg/init/cmd/service/cmd.go index f8c3c5cee..cff32f2fe 100644 --- a/pkg/init/cmd/service/cmd.go +++ b/pkg/init/cmd/service/cmd.go @@ -202,7 +202,7 @@ func start(ctx context.Context, service, sock, basePath, dumpSpec string) (strin io := func(id string) (cio.IO, error) { stdoutFile := logger.Path(service + ".out") - stderrFile := logger.Path(service + ".err") + stderrFile := logger.Path(service) return &logio{ cio.Config{ Stdin: "/dev/null", diff --git a/pkg/init/cmd/service/runc.go b/pkg/init/cmd/service/runc.go index b020e4324..656912bfd 100644 --- a/pkg/init/cmd/service/runc.go +++ b/pkg/init/cmd/service/runc.go @@ -87,7 +87,7 @@ func runcInit(rootPath, serviceType string) int { } defer stdout.Close() - stderrLog := serviceType + "." + name + ".err" + stderrLog := serviceType + "." + name stderr, err := logger.Open(stderrLog) if err != nil { log.Printf("Error opening stderr log connection: %v", err) From 7c243a8e8bf610fefac70ec21329a4bc72ba018b Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 13 Jul 2018 11:43:48 +0100 Subject: [PATCH 2/5] pkg/init: only create /var/log/onboot symlink if not using memlogd When logging directly to files (the not-using-memlogd case) the onboot services must log to /run/log because /var/log might be overmounted by a persistent disk. Therefore we create a symlink at the end of the onboot section. When logging via memlogd, all logs are buffered until a logwrite service starts, so no symlink is needed. Signed-off-by: David Scott --- pkg/init/cmd/service/logging.go | 16 ++++++++++++++++ pkg/init/cmd/service/runc.go | 6 +----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkg/init/cmd/service/logging.go b/pkg/init/cmd/service/logging.go index 820465bc8..ad6c0bd12 100644 --- a/pkg/init/cmd/service/logging.go +++ b/pkg/init/cmd/service/logging.go @@ -29,6 +29,7 @@ type Log interface { Path(string) string // Path of the log file (may be a FIFO) Open(string) (io.WriteCloser, error) // Opens a log stream Dump(string) // Copies logs to the console + Symlink(string) // Symlinks to the log directory (if there is one) } // GetLog returns the log destination we should use. @@ -82,6 +83,16 @@ func (f *fileLog) Dump(n string) { } } +// Symlinks to the log directory. This is useful if we are logging directly to tmpfs and now need to symlink from a permanent disk. +func (f *fileLog) Symlink(path string) { + parent := filepath.Dir(path) + if err := os.MkdirAll(parent, 0755); err != nil { + log.Printf("Error creating secondary log directory %s: %v", parent, err) + } else if err := os.Symlink(f.dir, path); err != nil && !os.IsExist(err) { + log.Printf("Error creating symlink from %s to %s: %v", path, f.dir, err) + } +} + type remoteLog struct { fifoDir string } @@ -164,6 +175,11 @@ func (r *remoteLog) Dump(n string) { } } +// Symlinks to the log directory. This is a no-op because there is no log directory. +func (r *remoteLog) Symlink(path string) { + return +} + func sendToLogger(name string, fd int) error { var ctlSocket int var err error diff --git a/pkg/init/cmd/service/runc.go b/pkg/init/cmd/service/runc.go index 656912bfd..30e85c38d 100644 --- a/pkg/init/cmd/service/runc.go +++ b/pkg/init/cmd/service/runc.go @@ -160,11 +160,7 @@ func runcInit(rootPath, serviceType string) int { _ = 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) - } + logger.Symlink(varLogLink) return status } From 70385eb86e7c107afa41c07fd319448cb09018bf Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 13 Jul 2018 11:47:59 +0100 Subject: [PATCH 3/5] Update yml to linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f Signed-off-by: David Scott --- contrib/crosvm/README.md | 2 +- 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/influxdb-os.yml | 2 +- examples/logging.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/rt-for-vmware.yml | 2 +- examples/scaleway.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/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 +- test/cases/000_build/000_formats/test.yml | 2 +- .../cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/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 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/010_hyperkit/005_run_kernel+squashfs/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/009_config_4.17.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/019_kmod_4.17.x/test.yml | 2 +- test/cases/020_kernel/110_namespace/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/cases/040_packages/030_logwrite/test.yml | 2 +- test/cases/040_packages/031_kmsg/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 2 +- 87 files changed, 87 insertions(+), 87 deletions(-) diff --git a/contrib/crosvm/README.md b/contrib/crosvm/README.md index 30d83b051..9bfc5b3a2 100644 --- a/contrib/crosvm/README.md +++ b/contrib/crosvm/README.md @@ -33,7 +33,7 @@ kernel: image: linuxkit/kernel:4.9.91 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 services: diff --git a/examples/aws.yml b/examples/aws.yml index 1bcb32b30..450aa53c9 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/azure.yml b/examples/azure.yml index ed3641572..6e5194397 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index ea711b6de..5eae165e6 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index be1b9ca40..4d02c02f0 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.5 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/docker.yml b/examples/docker.yml index bdcb0b00c..13d2295e5 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/gcp.yml b/examples/gcp.yml index fb01f0f4d..cd5011bff 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/getty.yml b/examples/getty.yml index 89abfbc40..2c560ec5d 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 2ce6b5a3a..c8ae00e78 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 924b01cc2..475cf4287 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/logging.yml b/examples/logging.yml index af4981a2e..556eba838 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/minimal.yml b/examples/minimal.yml index 692a2d6a6..b0ac05f31 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 0160047a8..9b4589be7 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 services: diff --git a/examples/openstack.yml b/examples/openstack.yml index 125e1f499..85a0ebc45 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/packet.yml b/examples/packet.yml index 5ac938d12..185608a62 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 479e25dbe..db7b29ff6 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 onboot: diff --git a/examples/rt-for-vmware.yml b/examples/rt-for-vmware.yml index dddbc76e1..0fca2d902 100644 --- a/examples/rt-for-vmware.yml +++ b/examples/rt-for-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54-rt cmdline: "console=tty0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/scaleway.yml b/examples/scaleway.yml index 0283cee6c..4cec61993 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/sshd.yml b/examples/sshd.yml index 2bba4d24e..6b6155264 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/swap.yml b/examples/swap.yml index 85fd7298d..7a889b3d8 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/tpm.yml b/examples/tpm.yml index 8d3f54f1c..2c25846c0 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/vmware.yml b/examples/vmware.yml index ee2e6a6ab..df77662d6 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 7a0da9cce..9f71d508a 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index eb60ffab5..5c632fed5 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index fb01f0f4d..cd5011bff 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 52c3004f2..bdaad456d 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/linuxkit.yml b/linuxkit.yml index 7b65c99fb..e9b06c589 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 9b7615be6..32bdf294b 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 314ec69ff..f951d9309 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 53cd4be03..dbd767b0f 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index ad34d440f..0c03a89f2 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index e17266643..9e52effab 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index ef50558d0..1dc4e2fde 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg-17e2eee03ab59f8df8a9c10ace003a84aec2f540" cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index f6c559466..7f41646a4 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 373152d95..7fe5e6b80 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.54 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index ae70e06a2..b32afb515 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index b50ba5b0f..3428e711f 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index bc1c9331a..d195a7110 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: dhcpcd diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index ff6e617f5..75f7e68c8 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index ff6e617f5..75f7e68c8 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 1c88adb47..1dfb6c7c8 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 481991df1..64bfea99b 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 481991df1..64bfea99b 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 481991df1..64bfea99b 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 481991df1..64bfea99b 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 04d724a15..29f5840d2 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 481991df1..64bfea99b 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 481991df1..64bfea99b 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 6ad914afa..a76ff6d4f 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 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 84836271a..cc4db9fb6 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.139 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 c756ad9d4..14527fe96 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.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 a6db299a9..a4aea49ee 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/009_config_4.17.x/test.yml b/test/cases/020_kernel/009_config_4.17.x/test.yml index 4216692d8..b28f804bd 100644 --- a/test/cases/020_kernel/009_config_4.17.x/test.yml +++ b/test/cases/020_kernel/009_config_4.17.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.17.5 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 00cccc9a0..67c7d04df 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.139 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 ef179b6f0..f39fce6d9 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.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 e9b2183d1..51c42a27f 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: check diff --git a/test/cases/020_kernel/019_kmod_4.17.x/test.yml b/test/cases/020_kernel/019_kmod_4.17.x/test.yml index 42dd13ac4..dbf6cd478 100644 --- a/test/cases/020_kernel/019_kmod_4.17.x/test.yml +++ b/test/cases/020_kernel/019_kmod_4.17.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.17.5 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: check diff --git a/test/cases/020_kernel/110_namespace/common.yml b/test/cases/020_kernel/110_namespace/common.yml index 783db0512..0a6f3aee8 100644 --- a/test/cases/020_kernel/110_namespace/common.yml +++ b/test/cases/020_kernel/110_namespace/common.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 8f444014a..edab5f697 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.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 7a646467b..b3166bf44 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.54 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 238122698..5abec0dfe 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 9645707f9..989dd8c53 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/ca-certificates:v0.5 onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 865b592e2..aa23f828e 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 57cf250d6..db86aa363 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 34f6fec30..4e3a15ab0 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 e281e71aa..26b609055 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 b9c87e3d8..992ea190b 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 25049a36c..8bf8f9d5c 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 188409ea5..ab1f98b86 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 cc0a97691..edcd4772b 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 547eaf3f1..a1284afba 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 db79fef95..beb7703d6 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 cffe551ae..3a8fb2258 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 aebcfc5c3..606d3ac74 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 b586ec8b5..fc40ed5ab 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 e6078f040..f7a63bbd1 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 9e12d9920..1ab63edb5 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 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 51b9cafa1..ccea2c85a 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index b3851f9cd..11b46bf08 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 947faeccc..37f1a0e8e 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 01c357d69..c6bd54e0b 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 6aed66ca6..4324d13c3 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.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index 0e98feeee..ed084be04 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 717b1d6c0..8a3d45dd6 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 - linuxkit/ca-certificates:v0.5 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 756ea194c..1fff4875c 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index 69322b7c5..937da4b32 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.14.54 cmdline: "console=ttyS0" init: - - linuxkit/init:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 - linuxkit/containerd:v0.5 onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 478adaf90..84ca02aa2 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:v0.5 + - linuxkit/init:3f1e5c32d6ca9e83a7ea7ad9854da2032971a83f - linuxkit/runc:v0.5 onboot: - name: test-ns From 637b1bdb3f2c2b8b1bb725324bda334744efe7b8 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 13 Jul 2018 10:39:11 +0100 Subject: [PATCH 4/5] pkg/kmsg: write to stderr (instead of stdout) Part of #3111 Signed-off-by: David Scott --- pkg/kmsg/main.go | 3 ++- test/cases/040_packages/031_kmsg/check.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/kmsg/main.go b/pkg/kmsg/main.go index 4a8c9a76b..81a3d0b3f 100644 --- a/pkg/kmsg/main.go +++ b/pkg/kmsg/main.go @@ -5,6 +5,7 @@ package main import ( "fmt" "log" + "os" "time" "github.com/euank/go-kmsg-parser/kmsgparser" @@ -20,6 +21,6 @@ func main() { kmsg := parser.Parse() for msg := range kmsg { - fmt.Printf("(%d) - %s: %s", msg.SequenceNumber, msg.Timestamp.Format(time.RFC3339Nano), msg.Message) + fmt.Fprintf(os.Stderr, "(%d) - %s: %s", msg.SequenceNumber, msg.Timestamp.Format(time.RFC3339Nano), msg.Message) } } diff --git a/test/cases/040_packages/031_kmsg/check.sh b/test/cases/040_packages/031_kmsg/check.sh index 82b24083e..584bf8ebc 100755 --- a/test/cases/040_packages/031_kmsg/check.sh +++ b/test/cases/040_packages/031_kmsg/check.sh @@ -2,7 +2,7 @@ for i in $(seq 1 20); do # Look for a common kernel log message - if grep "SCSI subsystem initialized" /var/log/kmsg.out.log 2>/dev/null; then + if grep "SCSI subsystem initialized" /var/log/kmsg.log 2>/dev/null; then printf "kmsg test suite PASSED\n" > /dev/console /sbin/poweroff -f fi @@ -10,6 +10,6 @@ for i in $(seq 1 20); do done printf "kmsg test suite FAILED\n" > /dev/console -echo "contents of /var/log/kmsg.out.log:" > /dev/console -cat /var/log/kmsg.out.log > /dev/console +echo "contents of /var/log/kmsg.log:" > /dev/console +cat /var/log/kmsg.log > /dev/console /sbin/poweroff -f From 887810a773430b66e3d798aea7e62580294a68ca Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 13 Jul 2018 10:45:33 +0100 Subject: [PATCH 5/5] Update yml to linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0 Signed-off-by: David Scott --- examples/logging.yml | 2 +- test/cases/040_packages/031_kmsg/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/logging.yml b/examples/logging.yml index 556eba838..3b9838c04 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -27,7 +27,7 @@ services: - name: write-and-rotate-logs image: linuxkit/logwrite:d9778c0d538094d398cf0cbfc89277aeca67f1be - name: kmsg - image: linuxkit/kmsg:v0.5 + image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0 trust: org: - linuxkit diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 8a3d45dd6..6e33010c4 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -9,7 +9,7 @@ init: - linuxkit/memlogd:v0.5 services: - name: kmsg - image: linuxkit/kmsg:v0.5 + image: linuxkit/kmsg:cf3dc833591838596427aac032c829ea592599d0 - name: write-and-rotate-logs image: linuxkit/logwrite:d9778c0d538094d398cf0cbfc89277aeca67f1be - name: check-the-logs