diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 7cff6ee95..81381b3ef 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/aws.yml b/examples/aws.yml index 50ae9e3b3..003f6b2b0 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/azure.yml b/examples/azure.yml index 58cef251b..e8df2bb4a 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index adb67289b..94e95355b 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/docker.yml b/examples/docker.yml index 00b3d7283..a92ca4e38 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/gcp.yml b/examples/gcp.yml index daf0c3679..c03108b68 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/getty.yml b/examples/getty.yml index 5a68453b7..3f9920e86 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/minimal.yml b/examples/minimal.yml index 197b3becf..c3a3a7c7c 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 3253eb0c8..39d5f542a 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b services: diff --git a/examples/openstack.yml b/examples/openstack.yml index 841e96e25..37d952587 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/packet.yml b/examples/packet.yml index 79b1f8d79..75d8ed04d 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS1 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index cb9cf19c4..fd90c604c 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index 537b45559..5b6908f68 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/swap.yml b/examples/swap.yml index 473ef4963..8bf04a2b4 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/tpm.yml b/examples/tpm.yml index 5471edb85..e040bfc59 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/vmware.yml b/examples/vmware.yml index db5af5875..ef48c4464 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 4b669b57c..480d0fd39 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/vsudd.yml b/examples/vsudd.yml index dbdb41930..9ee62ea52 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/examples/vultr.yml b/examples/vultr.yml index daf0c3679..c03108b68 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 8707f7c4c..cea76b2fa 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/linuxkit.yml b/linuxkit.yml index faee176f6..68e219c11 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/pkg/init/cmd/service/main.go b/pkg/init/cmd/service/main.go index c34201ce5..160266682 100644 --- a/pkg/init/cmd/service/main.go +++ b/pkg/init/cmd/service/main.go @@ -1,22 +1,25 @@ package main import ( + "context" "flag" "fmt" "os" "path/filepath" "strings" + "github.com/containerd/containerd/namespaces" log "github.com/sirupsen/logrus" ) const ( - defaultSocket = "/run/containerd/containerd.sock" - defaultPath = "/containers/services" - defaultContainerd = "/usr/bin/containerd" - installPath = "/usr/bin/service" - onbootPath = "/containers/onboot" - shutdownPath = "/containers/onshutdown" + defaultSocket = "/run/containerd/containerd.sock" + defaultPath = "/containers/services" + defaultContainerd = "/usr/bin/containerd" + installPath = "/usr/bin/service" + onbootPath = "/containers/onboot" + shutdownPath = "/containers/onshutdown" + defaultContainerdNamespace = "services.linuxkit" ) var ( @@ -48,8 +51,12 @@ func main() { fmt.Printf("Options:\n") flag.PrintDefaults() } - flagQuiet := flag.Bool("q", false, "Quiet execution") - flagVerbose := flag.Bool("v", false, "Verbose execution") + var ( + ctx = context.Background() + flagQuiet = flag.Bool("q", false, "Quiet execution") + flagVerbose = flag.Bool("v", false, "Verbose execution") + flagContainerdNamespace = flag.String("containerd-namespace", defaultContainerdNamespace, "containerd namespace to use with services") + ) // Set up logging log.SetFormatter(new(infoFormatter)) @@ -68,6 +75,8 @@ func main() { log.SetLevel(log.DebugLevel) } + ctx = namespaces.WithNamespace(ctx, *flagContainerdNamespace) + args := flag.Args() if len(args) < 1 { // check if called form startup scripts @@ -78,16 +87,16 @@ func main() { case strings.Contains(command, "onshutdown"): os.Exit(runcInit(shutdownPath)) case strings.Contains(command, "containerd"): - systemInitCmd([]string{}) + systemInitCmd(ctx, []string{}) os.Exit(0) } } switch args[0] { case "start": - startCmd(args[1:]) + startCmd(ctx, args[1:]) case "system-init": - systemInitCmd(args[1:]) + systemInitCmd(ctx, args[1:]) default: fmt.Printf("%q is not valid command.\n\n", args[0]) flag.Usage() diff --git a/pkg/init/cmd/service/start.go b/pkg/init/cmd/service/start.go index 187322f47..d4964ba1e 100644 --- a/pkg/init/cmd/service/start.go +++ b/pkg/init/cmd/service/start.go @@ -11,12 +11,11 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - "github.com/containerd/containerd/namespaces" specs "github.com/opencontainers/runtime-spec/specs-go" log "github.com/sirupsen/logrus" ) -func startCmd(args []string) { +func startCmd(ctx context.Context, args []string) { invoked := filepath.Base(os.Args[0]) flags := flag.NewFlagSet("start", flag.ExitOnError) flags.Usage = func() { @@ -48,7 +47,7 @@ func startCmd(args []string) { "service": service, }) - id, pid, msg, err := start(service, *sock, *path, *dumpSpec) + id, pid, msg, err := start(ctx, service, *sock, *path, *dumpSpec) if err != nil { log.WithError(err).Fatal(msg) } @@ -74,7 +73,7 @@ func (c *logio) Close() error { return nil } -func start(service, sock, basePath, dumpSpec string) (string, uint32, string, error) { +func start(ctx context.Context, service, sock, basePath, dumpSpec string) (string, uint32, string, error) { path := filepath.Join(basePath, service) runtimeConfig := getRuntimeConfig(path) @@ -90,8 +89,6 @@ func start(service, sock, basePath, dumpSpec string) (string, uint32, string, er return "", 0, "creating containerd client", err } - ctx := namespaces.WithNamespace(context.Background(), "default") - var spec *specs.Spec specf, err := os.Open(filepath.Join(path, "config.json")) if err != nil { diff --git a/pkg/init/cmd/service/system_init.go b/pkg/init/cmd/service/system_init.go index e530e54a5..3ca71b50c 100644 --- a/pkg/init/cmd/service/system_init.go +++ b/pkg/init/cmd/service/system_init.go @@ -13,7 +13,6 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" - "github.com/containerd/containerd/namespaces" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) @@ -52,7 +51,7 @@ func cleanupTask(ctx context.Context, ctr containerd.Container) error { } } -func systemInitCmd(args []string) { +func systemInitCmd(ctx context.Context, args []string) { invoked := filepath.Base(os.Args[0]) flags := flag.NewFlagSet("system-init", flag.ExitOnError) flags.Usage = func() { @@ -108,8 +107,6 @@ func systemInitCmd(args []string) { log.WithError(err).Fatal("creating containerd client") } - ctx := namespaces.WithNamespace(context.Background(), "default") - ctrs, err := client.Containers(ctx) if err != nil { log.WithError(err).Fatal("listing containers") @@ -140,7 +137,7 @@ func systemInitCmd(args []string) { return } for _, file := range files { - if id, pid, msg, err := start(file.Name(), *sock, *path, ""); err != nil { + if id, pid, msg, err := start(ctx, file.Name(), *sock, *path, ""); err != nil { log.WithError(err).Error(msg) } else { log.Debugf("Started %s pid %d", id, pid) diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index b2342813d..9194d5466 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 51ca1f2f5..fcee18f33 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 69920f8b6..b5b785a0e 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 b4dbe7b84..eba764064 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index d99ff1f17..e62c11412 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 f216af9d3..ca1e7c8b8 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed # with runc, logwrite, startmemlogd + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 # 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 ae91071c9..0cef9f240 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index d767203d4..5d7c4e8c2 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 855a6f9c2..8c8621058 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.75 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 9863db0e8..ba0d46ef6 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 44948f1d9..026da8553 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 e2ba5035d..0b15f6813 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 69d1c2b38..6ff752894 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 bc6e74d46..0419ebaec 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 08a141e17..ee6e4921c 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 08a141e17..ee6e4921c 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 08a141e17..ee6e4921c 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 08a141e17..ee6e4921c 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 09de66c19..092e5fbb4 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 08a141e17..ee6e4921c 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 8ce7aedf8..1fe29b578 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 7aae849dd..2e590a012 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.110 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 6e28b4a27..7e4388468 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 ffdad3695..03fcd4528 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.12 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 7bba9fa14..2ccecdcb7 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.110 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 8639b3f8e..4d8894f1d 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 3671c5fe2..836336daf 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.12 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 005b301c4..a1cdf135e 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.110 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 76b3cf119..dd3b2be68 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 f741cabc9..82482b2b1 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.12 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 33d2e4708..86b21262a 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.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 50eff4c72..4fe87a54d 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.75 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 b2fb3e94b..9037606b6 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 4467889e3..a4d118ecd 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 26cd14f4c..e91d51f8f 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 0e5dc3b29..8d385a292 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 ea018f4da..cdda6a0b2 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 2907dad3e..e76a97859 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 559dc9794..11c398f9c 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 e256cc561..346ec24a3 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 4ead559a6..1b35309d2 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 9e99b6dec..c5a3f45b4 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 3ad8ddea1..6e45cb7ab 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 9b5fc006c..2c75166fa 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 20947d694..636c02916 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 b9772ccf7..4caa2a9c0 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 f7b560add..79cd1b1cb 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 1e7af543e..b3a1f4a2f 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 ebcd556c7..fb29bfe3a 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 8732460ac..4e09d487f 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 e974c806e..720198bf9 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 c3e07712c..8da3460bf 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 59fc5daa4..c08613984 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 ec7c0b332..8dcfeeabf 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.75 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - 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 127a6dd72..2d91f0579 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index b3a26c392..5bbce2066 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:4.9.75 cmdline: "console=ttyS0" init: - - linuxkit/init:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 - linuxkit/containerd:e58a382c33bb509ba3e0e8170dfaa5a100504c5b onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 92d0bd612..13166751a 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:5a577d070817b4f17821657823082651baafd4ed + - linuxkit/init:fb1e34662dc92a45f8e92c91adbee094e22feb55 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: test-ns