From 57cf8df3b2bf616c1ad074a3e0592297958c632d Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 11 Jan 2018 11:38:41 +0000 Subject: [PATCH 1/4] Revendor moby tool to f816553d2fc58638f6904fddedd13c36d237b498 Pulls in: f816553 Merge pull request #195 from ijc/prepend-rootfs-mounts 0a6d69d Prepend the rootfs mounts to the user specified runtime.mounts. Signed-off-by: Ian Campbell --- src/cmd/linuxkit/vendor.conf | 2 +- .../github.com/moby/tool/src/moby/image.go | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/cmd/linuxkit/vendor.conf b/src/cmd/linuxkit/vendor.conf index b256832b7..d88d035c3 100644 --- a/src/cmd/linuxkit/vendor.conf +++ b/src/cmd/linuxkit/vendor.conf @@ -26,7 +26,7 @@ github.com/moby/datakit 97b3d230535397a813323902c23751e176481a86 github.com/moby/hyperkit a12cd7250bcd8d689078e3e42ae4a7cf6a0cbaf3 # When updating also: # curl -fsSL -o src/cmd/linuxkit/build.go https://raw.githubusercontent.com/moby/tool/«hash»/cmd/moby/build.go -github.com/moby/tool 1aca4eefa5fcfb2248e6b2e4ce7251a9a3b5a60a +github.com/moby/tool f816553d2fc58638f6904fddedd13c36d237b498 github.com/moby/vpnkit 0e4293bb1058598c4b0a406ed171f52573ef414c github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448 github.com/opencontainers/image-spec v1.0.0 diff --git a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/image.go b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/image.go index 22def6cfc..cb1e23be0 100644 --- a/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/image.go +++ b/src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/image.go @@ -229,6 +229,7 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt return err } + var rootfsMounts []specs.Mount if !readonly { // add a tmp directory to be used as a mount point for tmpfs for upper, work tmp := path.Join(prefix, "tmp") @@ -250,13 +251,12 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt return err } overlayOptions := []string{"lowerdir=/" + root, "upperdir=/" + path.Join(tmp, "upper"), "workdir=/" + path.Join(tmp, "work")} - runtimeMounts := append(*runtime.Mounts, - specs.Mount{Source: "tmpfs", Type: "tmpfs", Destination: "/" + tmp}, + rootfsMounts = []specs.Mount{ + {Source: "tmpfs", Type: "tmpfs", Destination: "/" + tmp}, // remount private as nothing else should see the temporary layers - specs.Mount{Destination: "/" + tmp, Options: []string{"remount", "private"}}, - specs.Mount{Source: "overlay", Type: "overlay", Destination: "/" + path.Join(prefix, "rootfs"), Options: overlayOptions}, - ) - runtime.Mounts = &runtimeMounts + {Destination: "/" + tmp, Options: []string{"remount", "private"}}, + {Source: "overlay", Type: "overlay", Destination: "/" + path.Join(prefix, "rootfs"), Options: overlayOptions}, + } } else { if foundElsewhere { // we need to make the mountpoint at rootfs @@ -270,10 +270,15 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt } } // either bind from another location, or bind from self to make sure it is a mountpoint as runc prefers this - runtimeMounts := append(*runtime.Mounts, specs.Mount{Source: "/" + root, Destination: "/" + path.Join(prefix, "rootfs"), Options: []string{"bind"}}) - runtime.Mounts = &runtimeMounts + rootfsMounts = []specs.Mount{ + {Source: "/" + root, Destination: "/" + path.Join(prefix, "rootfs"), Options: []string{"bind"}}, + } } + // Prepend the rootfs onto the user specified mounts. + runtimeMounts := append(rootfsMounts, *runtime.Mounts...) + runtime.Mounts = &runtimeMounts + // write the runtime config runtimeConfig, err := json.MarshalIndent(runtime, "", " ") if err != nil { From 794ea7ed72aff1bbd3bd88383acf58e221d02a07 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 11 Jan 2018 11:39:58 +0000 Subject: [PATCH 2/4] Make runtime.mounts[].destination relative to container rootfs This is similar to ae64ab6b825a6208b68eaf1bb3e79eafc178144f from #2849 which did the same for runtime.mkdir. This makes it possible to specify both host (absolute) or container (relative) paths. Signed-off-by: Ian Campbell --- pkg/init/cmd/service/prepare.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkg/init/cmd/service/prepare.go b/pkg/init/cmd/service/prepare.go index 1c852b817..ca2f82632 100644 --- a/pkg/init/cmd/service/prepare.go +++ b/pkg/init/cmd/service/prepare.go @@ -144,11 +144,20 @@ func prepareFilesystem(path string, runtime Runtime) error { // we execute Mounts before Mkdir so you can make a directory under a mount // but we do mkdir of the destination path in case missing rootfs := filepath.Join(path, "rootfs") + makeAbsolute := func(dir string) string { + if filepath.IsAbs(dir) { + return dir + } + // relative paths are relative to rootfs of container + return filepath.Join(rootfs, dir) + } + for _, mount := range runtime.Mounts { const mode os.FileMode = 0755 - err := os.MkdirAll(mount.Destination, mode) + dir := makeAbsolute(mount.Destination) + err := os.MkdirAll(dir, mode) if err != nil { - return fmt.Errorf("Cannot create directory for mount destination %s: %v", mount.Destination, err) + return fmt.Errorf("Cannot create directory for mount destination %s: %v", dir, err) } // also mkdir upper and work directories on overlay for _, o := range mount.Options { @@ -161,17 +170,14 @@ func prepareFilesystem(path string, runtime Runtime) error { } } opts, data := parseMountOptions(mount.Options) - if err := unix.Mount(mount.Source, mount.Destination, mount.Type, uintptr(opts), data); err != nil { + if err := unix.Mount(mount.Source, dir, mount.Type, uintptr(opts), data); err != nil { return fmt.Errorf("Failed to mount %s: %v", mount.Source, err) } } for _, dir := range runtime.Mkdir { // in future we may need to change the structure to set mode, ownership const mode os.FileMode = 0755 - // relative paths are relative to rootfs of container - if !filepath.IsAbs(dir) { - dir = filepath.Join(rootfs, dir) - } + dir = makeAbsolute(dir) err := os.MkdirAll(dir, mode) if err != nil { return fmt.Errorf("Cannot create directory %s: %v", dir, err) From 4f793665265524bdaae0be6e666dfdffd9400989 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 11 Jan 2018 13:14:31 +0000 Subject: [PATCH 3/4] Update yaml Signed-off-by: Ian Campbell --- blueprints/docker-for-mac/base.yml | 2 +- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/cadvisor.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.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.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 +- 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/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/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 +- 78 files changed, 78 insertions(+), 78 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 04e62b08e..1a1c82581 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:728e5fe9e6b818d9825b28826b929ae75a386e9e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/aws.yml b/examples/aws.yml index 7814dc0ba..ff81ad4b4 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/azure.yml b/examples/azure.yml index fe7d4a34b..d9be3e92e 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index f2fd85098..d97111c29 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/docker.yml b/examples/docker.yml index 8b9a70edb..36f69a739 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/gcp.yml b/examples/gcp.yml index 2492af700..016993483 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/getty.yml b/examples/getty.yml index 0109568c5..c30484e49 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/minimal.yml b/examples/minimal.yml index 72b30459c..fc224e49e 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index fc9f2fcf7..11417365b 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b services: diff --git a/examples/openstack.yml b/examples/openstack.yml index 891cf91a4..0e3186881 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/packet.yml b/examples/packet.yml index 66293c4ea..3d6bb8128 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS1 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index e3e4d71af..6e88f9f52 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index d3258df98..91280ccc1 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/swap.yml b/examples/swap.yml index 44b8e026f..8e7145319 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/tpm.yml b/examples/tpm.yml index 0220b4f92..f00f79cfe 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/vmware.yml b/examples/vmware.yml index 0be3a1b3a..abcd4cd7f 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index d80efebc1..238334371 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/vsudd.yml b/examples/vsudd.yml index eaf510200..8afdf95bb 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index 2492af700..016993483 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 18cf8237d..9c1186ba1 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/linuxkit.yml b/linuxkit.yml index bbed78b67..bb5829ec3 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index a545835e4..e00cdbe89 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 108d434a2..2d92748ad 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index da25fba9d..7f7cc328a 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 89ff9938d..5d057004d 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index c87547ef2..ed142c244 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - 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 5b4257977..b07d090d8 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd # with runc, logwrite, startmemlogd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f # with runc, logwrite, startmemlogd - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 50de17feb..3bf8dd4b4 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 7b7379c4c..7cc41e64c 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 62ed8fb6a..9a46017b7 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.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index fb19174e0..1aaf8e4aa 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 90afb7988..6cb8eb4fa 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 526f1bc18..61229a80f 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 b2174c4cb..3ca0ce897 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 ec729ac43..444916cf4 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 4ed287849..44d7fb151 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 4ed287849..44d7fb151 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 4ed287849..44d7fb151 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 4ed287849..44d7fb151 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 2bafb9eba..aa1d7f09f 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 4ed287849..44d7fb151 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 b3ce88ddf..78017cc52 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b 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 9de5877e8..127c55e32 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.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 f315056e8..0d216f82b 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 4b668265a..ba62196b4 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 512073437..2aec64cab 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.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 8343b42c3..e78d96602 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 b865dd823..b01c6eed4 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 74c5a4f36..fa5f3e51b 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.111 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 c3f5d37aa..8d84cc754 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 223d4a159..f740bcb5d 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.13 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 75672d6f8..2b8320528 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.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 9121c4c57..cd6c2d21d 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.76 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 3f97a4dd5..ce0e3d4e3 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 eee691a9e..ea22472fd 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 76cb0af76..665e844d1 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index ba73e1bf1..13f4437ef 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 d5d98515b..86b00d5be 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 b0270bbed..144be99a2 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 6348f2c85..20e4b0fca 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 c923d87b8..e51e8a70e 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 ddb0c8f57..7a2fcd5c8 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 c532af445..6fffc0583 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 62d182e33..5b585a017 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 ffd0e8893..822f35eb7 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 622451209..9c4bc084f 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 a18de5d98..ce1e18bc1 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 c8bd81945..99f7715e6 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 a87c6b185..052f99331 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 bc68ff82e..fc05db03e 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 e42ccf0bb..8d6cff3a0 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index dfcf9f994..7493dbac5 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index e1ab83f3f..dd12180db 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index fc8253618..3fc5c8c21 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: sysctl diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index d1612db30..95f32f752 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.76 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index fe121328e..93aca6d11 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index e2eaa1a76..91a57ea64 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.76 cmdline: "console=ttyS0" init: - - linuxkit/init:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index f9a6e3745..088b031b9 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:6992bd1308bdfd8af5a74aba293bb53e99b482bd + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: test-ns From 4476169fcea3b177dffaf8bf5e82d39fb1f8ad39 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 10 Jan 2018 11:05:31 +0000 Subject: [PATCH 4/4] Add an example of setting up a writeable overlay of a host path Signed-off-by: Ian Campbell --- examples/hostmount-writeable-overlay.yml | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 examples/hostmount-writeable-overlay.yml diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml new file mode 100644 index 000000000..b26135853 --- /dev/null +++ b/examples/hostmount-writeable-overlay.yml @@ -0,0 +1,47 @@ +kernel: + image: linuxkit/kernel:4.9.76 + cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:81fc00e879cf56fa6f058f6c891b012bc867de7f + - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 + - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b + - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 +onboot: + - name: sysctl + image: linuxkit/sysctl:4c1ef93bb5eb1a877318db4b2daa6768ed002e21 + - name: dhcpcd + image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 + command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] +onshutdown: + - name: shutdown + image: busybox:latest + command: ["/bin/echo", "so long and thanks for all the fish"] +services: + - name: getty + image: linuxkit/getty:22e27189b6b354e1d5d38fc0536a5af3f2adb79f + env: + - INSECURE=true + runtime: + mounts: + # Makes a writeable (but private and non-persistent) mount of the + # host etc into the container. + - type: overlay + source: overlay + destination: writeable-host-etc + options: ["rw", "lowerdir=/etc", "upperdir=/run/hostetc/upper", "workdir=/run/hostetc/work"] + - name: rngd + image: linuxkit/rngd:94e01a4b16fadb053455cdc2269c4eb0b39199cd + - name: nginx + image: nginx:alpine + capabilities: + - CAP_NET_BIND_SERVICE + - CAP_CHOWN + - CAP_SETUID + - CAP_SETGID + - CAP_DAC_OVERRIDE + binds: + - /etc/resolv.conf:/etc/resolv.conf +trust: + org: + - linuxkit + - library