From e40db1459891e3edf303a12996488d7613571a17 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 26 Jul 2017 11:21:14 +0100 Subject: [PATCH 1/2] Make service start up containerd and services This moves most of the initialisation of containers to the service init in the `service` command. Still leaves remounting root file systems read only but this will go away shortly. Another step closer to removing shell scripts in base system. Signed-off-by: Justin Cormack --- pkg/containerd/cmd/service/main.go | 10 ++++- pkg/containerd/cmd/service/start.go | 51 ++++++++++++++--------- pkg/containerd/cmd/service/system_init.go | 51 ++++++++++++++++++++++- pkg/containerd/etc/init.d/020-containerd | 15 +------ 4 files changed, 90 insertions(+), 37 deletions(-) diff --git a/pkg/containerd/cmd/service/main.go b/pkg/containerd/cmd/service/main.go index 801c71078..3d6957f5c 100644 --- a/pkg/containerd/cmd/service/main.go +++ b/pkg/containerd/cmd/service/main.go @@ -9,6 +9,12 @@ import ( log "github.com/Sirupsen/logrus" ) +const ( + defaultSocket = "/run/containerd/containerd.sock" + defaultPath = "/containers/services" + defaultContainerd = "/usr/bin/containerd" +) + var ( defaultLogFormatter = &log.TextFormatter{} ) @@ -67,9 +73,9 @@ func main() { switch args[0] { case "start": - start(args[1:]) + startCmd(args[1:]) case "system-init": - systemInit(args[1:]) + systemInitCmd(args[1:]) default: fmt.Printf("%q is not valid command.\n\n", args[0]) flag.Usage() diff --git a/pkg/containerd/cmd/service/start.go b/pkg/containerd/cmd/service/start.go index 82004df90..e34c969dd 100644 --- a/pkg/containerd/cmd/service/start.go +++ b/pkg/containerd/cmd/service/start.go @@ -15,7 +15,7 @@ import ( specs "github.com/opencontainers/runtime-spec/specs-go" ) -func start(args []string) { +func startCmd(args []string) { invoked := filepath.Base(os.Args[0]) flags := flag.NewFlagSet("start", flag.ExitOnError) flags.Usage = func() { @@ -24,7 +24,8 @@ func start(args []string) { flags.PrintDefaults() } - sock := flags.String("sock", "/run/containerd/containerd.sock", "Path to containerd socket") + sock := flags.String("sock", defaultSocket, "Path to containerd socket") + path := flags.String("path", defaultPath, "Path to service configs") dumpSpec := flags.String("dump-spec", "", "Dump container spec to file before start") @@ -40,55 +41,65 @@ func start(args []string) { } service := args[0] - rootfs := filepath.Join("/containers/services", service, "rootfs") + log.Infof("Starting service: %q", service) log := log.WithFields(log.Fields{ "service": service, }) - client, err := containerd.New(*sock) + id, pid, msg, err := start(service, *sock, *path, *dumpSpec) if err != nil { - log.WithError(err).Fatal("creating containerd client") + log.WithError(err).Fatal(msg) + } + + log.Debugf("Started %s pid %d", id, pid) +} + +func start(service, sock, path, dumpSpec string) (string, uint32, string, error) { + rootfs := filepath.Join(path, service, "rootfs") + + client, err := containerd.New(sock) + if err != nil { + return "", 0, "creating containerd client", err } ctx := namespaces.WithNamespace(context.Background(), "default") var spec *specs.Spec - specf, err := os.Open(filepath.Join("/containers/services", service, "config.json")) + specf, err := os.Open(filepath.Join(path, service, "config.json")) if err != nil { - log.WithError(err).Fatal("failed to read service spec") + return "", 0, "failed to read service spec", err } if err := json.NewDecoder(specf).Decode(&spec); err != nil { - log.WithError(err).Fatal("failed to parse service spec") + return "", 0, "failed to parse service spec", err } - log.Debugf("Rootfs is %s", rootfs) - spec.Root.Path = rootfs - if *dumpSpec != "" { - d, err := os.Create(*dumpSpec) + if dumpSpec != "" { + d, err := os.Create(dumpSpec) if err != nil { - log.WithError(err).Fatal("failed to open file for spec dump") + return "", 0, "failed to open file for spec dump", err } enc := json.NewEncoder(d) enc.SetIndent("", " ") if err := enc.Encode(&spec); err != nil { - log.WithError(err).Fatal("failed to write spec dump") + return "", 0, "failed to write spec dump", err } } ctr, err := client.NewContainer(ctx, service, containerd.WithSpec(spec)) if err != nil { - log.WithError(err).Fatal("failed to create container") + return "", 0, "failed to create container", err } io := func() (*containerd.IO, error) { logfile := filepath.Join("/var/log", service+".log") // We just need this to exist. - if err := ioutil.WriteFile(logfile, []byte{}, 0666); err != nil { - log.WithError(err).Fatal("failed to touch logfile") + if err := ioutil.WriteFile(logfile, []byte{}, 0600); err != nil { + // if we cannot write to log, discard output + logfile = "/dev/null" } return &containerd.IO{ Stdin: "/dev/null", @@ -101,13 +112,13 @@ func start(args []string) { task, err := ctr.NewTask(ctx, io) if err != nil { // Don't bother to destroy the container here. - log.WithError(err).Fatal("failed to create task") + return "", 0, "failed to create task", err } if err := task.Start(ctx); err != nil { // Don't destroy the container here so it can be inspected for debugging. - log.WithError(err).Fatal("failed to start task") + return "", 0, "failed to start task", err } - log.Debugf("Started %s pid %d", ctr.ID(), task.Pid()) + return ctr.ID(), task.Pid(), "", nil } diff --git a/pkg/containerd/cmd/service/system_init.go b/pkg/containerd/cmd/service/system_init.go index b412e707b..c450d5f40 100644 --- a/pkg/containerd/cmd/service/system_init.go +++ b/pkg/containerd/cmd/service/system_init.go @@ -4,9 +4,12 @@ import ( "context" "flag" "fmt" + "io/ioutil" "os" + "os/exec" "path/filepath" "syscall" + "time" log "github.com/Sirupsen/logrus" "github.com/containerd/containerd" @@ -49,7 +52,7 @@ func cleanupTask(ctx context.Context, ctr containerd.Container) error { } } -func systemInit(args []string) { +func systemInitCmd(args []string) { invoked := filepath.Base(os.Args[0]) flags := flag.NewFlagSet("system-init", flag.ExitOnError) flags.Usage = func() { @@ -58,7 +61,9 @@ func systemInit(args []string) { flags.PrintDefaults() } - sock := flags.String("sock", "/run/containerd/containerd.sock", "Path to containerd socket") + sock := flags.String("sock", defaultSocket, "Path to containerd socket") + path := flags.String("path", defaultPath, "Path to service configs") + binary := flags.String("containerd", defaultContainerd, "Path to containerd") if err := flags.Parse(args); err != nil { log.Fatal("Unable to parse args") @@ -71,6 +76,33 @@ func systemInit(args []string) { os.Exit(1) } + // remove (unlikely) old containerd socket + _ = os.Remove(*sock) + + // start up containerd + cmd := exec.Command(*binary) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + if err := cmd.Start(); err != nil { + log.WithError(err).Fatal("cannot start containerd") + } + + // wait for containerd socket to appear + for { + _, err := os.Stat(*sock) + if err == nil { + break + } + err = cmd.Process.Signal(syscall.Signal(0)) + if err != nil { + // process not there, wait() to find error + err = cmd.Wait() + log.WithError(err).Fatal("containerd process exited") + } + time.Sleep(100 * time.Millisecond) + } + + // connect to containerd client, err := containerd.New(*sock) if err != nil { log.WithError(err).Fatal("creating containerd client") @@ -83,6 +115,7 @@ func systemInit(args []string) { log.WithError(err).Fatal("listing containers") } + // Clean up any old containers // None of the errors in this loop are fatal since we want to // keep trying. for _, ctr := range ctrs { @@ -99,4 +132,18 @@ func systemInit(args []string) { log.WithError(err).Error("deleting container") } } + + // Start up containers + files, err := ioutil.ReadDir(*path) + // just skip if there is an error, eg no such path + if err != nil { + return + } + for _, file := range files { + if id, pid, msg, err := start(file.Name(), *sock, *path, ""); err != nil { + log.WithError(err).Error(msg) + } else { + log.Debugf("Started %s pid %d", id, pid) + } + } } diff --git a/pkg/containerd/etc/init.d/020-containerd b/pkg/containerd/etc/init.d/020-containerd index af34e26da..845a09b1b 100755 --- a/pkg/containerd/etc/init.d/020-containerd +++ b/pkg/containerd/etc/init.d/020-containerd @@ -1,25 +1,14 @@ #!/bin/sh -# bring up containerd -printf "\nStarting containerd\n" -/usr/bin/containerd & - -# wait for socket to be there -while [ ! -S /run/containerd/containerd.sock ] -do - sleep 0.1 -done - # start service containers -service system-init - if [ -d /containers/services ] then for f in $(find /containers/services -mindepth 1 -maxdepth 1 | sort) do /bin/mount --bind "$f/rootfs" "$f/rootfs" mount -o remount,rw "$f/rootfs" - service start "$(basename $f)" done fi + +service system-init From 74e067748a8cc1c629096cb7505fb1ead1b76e6e Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 26 Jul 2017 12:08:09 +0100 Subject: [PATCH 2/2] Update hashes for containerd Signed-off-by: Justin Cormack --- blueprints/docker-for-mac/base.yml | 2 +- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- examples/vultr.yml | 2 +- linuxkit.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/etcd/etcd.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/kubernetes/kube-master.yml | 2 +- projects/kubernetes/kube-node.yml | 2 +- projects/logging/examples/logging.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 +- projects/swarmd/swarmd.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/030_security/000_docker-bench/test-docker-bench.yml | 2 +- test/cases/040_packages/003_containerd/test-containerd.yml | 2 +- test/cases/040_packages/007_getty-containerd/test-ctr.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index d2a8305a3..fda70a0e1 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -6,7 +6,7 @@ init: - linuxkit/vpnkit-expose-port:e2b49a6c56fbf876ea24f0a5ce4ccae5f940d1be # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 onboot: # support metadata for optional config in /var/config - name: metadata diff --git a/examples/aws.yml b/examples/aws.yml index 537036b66..077942b96 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index bdb70f3c1..8112bb21b 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index 4e004a7ba..ce7d1edbd 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 75293e7bf..027d863ae 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index cbfef8bad..8c8852b70 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index 7e163b1b1..de271c115 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 374b9e7d1..7f089800a 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 services: - name: getty image: linuxkit/getty:97c5e2c8ebad23c2ed743366b475b5c15c42f70e diff --git a/examples/packet.yml b/examples/packet.yml index e40ff28b0..5cee89b1e 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index e39a90679..575c71bcb 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/sshd.yml b/examples/sshd.yml index f14f71dda..6ad311d18 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index cce910c65..720a2f127 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index cf86bf244..c4b0b5a0a 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index d3e4ee9d0..04a8c3186 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 0fcff7ec9..206f064d9 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 diff --git a/examples/vultr.yml b/examples/vultr.yml index 1d296be36..7c9eaaf79 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index 85c7d63b8..119ef6210 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 33187fe9d..124ace96c 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index df54a11f9..e56db064a 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index ae743a824..d7b2206f3 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 81993f140..c66c46ac7 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 40b39a50e..2c6b2b5b5 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index a7ac93d2f..7183328e0 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 803f91a4c..c0516a86a 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e # with runc, logwrite, startmemlogd - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 8e907329f..81f6cbb15 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 875d05695..e858a1771 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index c9d64c6bc..65b420e61 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index fc8826708..c1edd6e40 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index e588d04bd..a47a68d92 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl 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 f2a1e2df7..f5f25437a 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 services: - name: acpid image: linuxkit/acpid:1966310cb75e28ffc668863a6577ee991327f918 diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index ff0133acd..c439e25e7 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test-containerd.yml index f51cc5f6c..33c1d9b82 100644 --- a/test/cases/040_packages/003_containerd/test-containerd.yml +++ b/test/cases/040_packages/003_containerd/test-containerd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/test/cases/040_packages/007_getty-containerd/test-ctr.yml b/test/cases/040_packages/007_getty-containerd/test-ctr.yml index f404783d8..0c29df778 100644 --- a/test/cases/040_packages/007_getty-containerd/test-ctr.yml +++ b/test/cases/040_packages/007_getty-containerd/test-ctr.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index d8cef69f9..a2a43e03d 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 onboot: - name: ltp image: linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d diff --git a/test/hack/test.yml b/test/hack/test.yml index ca40c3aa9..3129b29df 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:a19363d2546205d4613a52371414f79c06d7070e - linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630 - - linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e + - linuxkit/containerd:ff59f34e79369a6f2ce7c2a7b1cf0fcb226b31f4 onboot: - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41