diff --git a/examples/aws.yml b/examples/aws.yml index 9273c2f0a..5ef810adb 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 131de430c..d0592d491 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d diff --git a/examples/docker.yml b/examples/docker.yml index 1b7a4e377..70241cce6 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -20,7 +20,7 @@ onboot: command: ["/mount.sh", "/var/lib/docker"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/gcp.yml b/examples/gcp.yml index 994a916bb..5d0dce48f 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -16,7 +16,7 @@ onboot: image: "linuxkit/metadata:31a0b0f5557c6123beaa9c33e3400ae3c03447e0" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/getty.yml b/examples/getty.yml index 653f39f2c..810d3963a 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 @@ -14,7 +14,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" # to make insecure with passwordless root login, uncomment following lines #env: # - INSECURE=true diff --git a/examples/minimal.yml b/examples/minimal.yml index e1280c0b3..3284bc4fe 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true trust: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 186f426f7..380bff9ea 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,12 +2,12 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/packet.yml b/examples/packet.yml index 57a54fdc6..3c828f1da 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS1 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index d8facd09c..e231d209f 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,16 +4,16 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: redis diff --git a/examples/sshd.yml b/examples/sshd.yml index ff70a9c9a..ad098c435 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/swap.yml b/examples/swap.yml index d2bce7b68..55425f770 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl @@ -24,7 +24,7 @@ onboot: command: ["/swap.sh", "--path", "/var/external/swap", "--size", "1G", "--encrypt"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/vmware.yml b/examples/vmware.yml index d7d753b32..1642ee39d 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -2,16 +2,16 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index aef0fc929..56443354a 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 73689da0f..7eab63c29 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/linuxkit.yml b/linuxkit.yml index ebe376f2e..a2f43ec0a 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd @@ -34,7 +34,8 @@ files: contents: | state = "/run/containerd" root = "/var/lib/containerd" - snapshotter = "overlay" + snapshotter = "io.containerd.snapshotter.v1.overlayfs" + differ = "io.containerd.differ.v1.base-diff" subreaper = false [grpc] diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index c7a017b27..60947a9a5 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:630ee558e4869672fae230c78364e367b8ea67a9 as alpine +FROM linuxkit/alpine:7cf5393e04fe0e26e9fa8f507379cacb64595918 as alpine RUN \ apk add \ btrfs-progs-dev \ @@ -9,8 +9,8 @@ RUN \ linux-headers \ make \ && true -ENV GOPATH=/root/go -ENV CONTAINERD_COMMIT=bdf9f5f7388e8203e63a74b89800f7f3dd4a7743 +ENV GOPATH=/go PATH=$PATH:/go/bin +ENV CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git @@ -18,11 +18,16 @@ WORKDIR $GOPATH/src/github.com/containerd/containerd RUN git checkout $CONTAINERD_COMMIT RUN make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" RUN cp bin/containerd bin/ctr bin/containerd-shim bin/dist /usr/bin/ + +ADD cmd /go/src/cmd +RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd +RUN go-compile.sh /go/src/cmd/service + WORKDIR / COPY . . FROM scratch ENTRYPOINT [] WORKDIR / -COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /usr/bin/ +COPY --from=alpine /usr/bin/containerd /usr/bin/ctr /usr/bin/dist /usr/bin/containerd-shim /go/bin/service /usr/bin/ COPY --from=alpine /etc/containerd/config.toml /etc/containerd/ diff --git a/pkg/containerd/cmd/service/main.go b/pkg/containerd/cmd/service/main.go new file mode 100644 index 000000000..39ccf91f1 --- /dev/null +++ b/pkg/containerd/cmd/service/main.go @@ -0,0 +1,75 @@ +package main + +import ( + "flag" + "fmt" + "os" + "path/filepath" + + log "github.com/Sirupsen/logrus" +) + +var ( + defaultLogFormatter = &log.TextFormatter{} +) + +// infoFormatter overrides the default format for Info() log events to +// provide an easier to read output +type infoFormatter struct { +} + +func (f *infoFormatter) Format(entry *log.Entry) ([]byte, error) { + if entry.Level == log.InfoLevel { + return append([]byte(entry.Message), '\n'), nil + } + return defaultLogFormatter.Format(entry) +} + +func main() { + flag.Usage = func() { + fmt.Printf("USAGE: %s [options] COMMAND\n\n", filepath.Base(os.Args[0])) + fmt.Printf("Commands:\n") + fmt.Printf(" start Start a service\n") + fmt.Printf(" help Print this message\n") + fmt.Printf("\n") + fmt.Printf("Run '%s COMMAND --help' for more information on the command\n", filepath.Base(os.Args[0])) + fmt.Printf("\n") + fmt.Printf("Options:\n") + flag.PrintDefaults() + } + flagQuiet := flag.Bool("q", false, "Quiet execution") + flagVerbose := flag.Bool("v", false, "Verbose execution") + + // Set up logging + log.SetFormatter(new(infoFormatter)) + log.SetLevel(log.InfoLevel) + flag.Parse() + if *flagQuiet && *flagVerbose { + fmt.Printf("Can't set quiet and verbose flag at the same time\n") + os.Exit(1) + } + if *flagQuiet { + log.SetLevel(log.ErrorLevel) + } + if *flagVerbose { + // Switch back to the standard formatter + log.SetFormatter(defaultLogFormatter) + log.SetLevel(log.DebugLevel) + } + + args := flag.Args() + if len(args) < 1 { + fmt.Printf("Please specify a command.\n\n") + flag.Usage() + os.Exit(1) + } + + switch args[0] { + case "start": + start(args[1:]) + default: + fmt.Printf("%q is not valid command.\n\n", args[0]) + flag.Usage() + os.Exit(1) + } +} diff --git a/pkg/containerd/cmd/service/skanky-vendor.sh b/pkg/containerd/cmd/service/skanky-vendor.sh new file mode 100755 index 000000000..483002264 --- /dev/null +++ b/pkg/containerd/cmd/service/skanky-vendor.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# +# We only need the containerd client and its transitive dependencies +# and we conveniently have a checkout already. We actually prefer to +# reuse containerd's vendoring for consistency anyway. + +set -eu +ctrd=$1 +cp -r $ctrd/vendor/ vendor/ +# We need containerd itself of course +mkdir -p vendor/github.com/containerd +cp -r $ctrd vendor/github.com/containerd/containerd +# Stop go finding nested vendorings +rm -rf vendor/github.com/containerd/containerd/vendor diff --git a/pkg/containerd/cmd/service/start.go b/pkg/containerd/cmd/service/start.go new file mode 100644 index 000000000..82004df90 --- /dev/null +++ b/pkg/containerd/cmd/service/start.go @@ -0,0 +1,113 @@ +package main + +import ( + "context" + "encoding/json" + "flag" + "fmt" + "io/ioutil" + "os" + "path/filepath" + + log "github.com/Sirupsen/logrus" + "github.com/containerd/containerd" + "github.com/containerd/containerd/namespaces" + specs "github.com/opencontainers/runtime-spec/specs-go" +) + +func start(args []string) { + invoked := filepath.Base(os.Args[0]) + flags := flag.NewFlagSet("start", flag.ExitOnError) + flags.Usage = func() { + fmt.Printf("USAGE: %s start [service]\n\n", invoked) + fmt.Printf("Options:\n") + flags.PrintDefaults() + } + + sock := flags.String("sock", "/run/containerd/containerd.sock", "Path to containerd socket") + + dumpSpec := flags.String("dump-spec", "", "Dump container spec to file before start") + + if err := flags.Parse(args); err != nil { + log.Fatal("Unable to parse args") + } + args = flags.Args() + + if len(args) != 1 { + fmt.Println("Please specify the service") + flags.Usage() + os.Exit(1) + } + + 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) + if err != nil { + log.WithError(err).Fatal("creating containerd client") + } + + ctx := namespaces.WithNamespace(context.Background(), "default") + + var spec *specs.Spec + specf, err := os.Open(filepath.Join("/containers/services", service, "config.json")) + if err != nil { + log.WithError(err).Fatal("failed to read service spec") + } + if err := json.NewDecoder(specf).Decode(&spec); err != nil { + log.WithError(err).Fatal("failed to parse service spec") + } + + log.Debugf("Rootfs is %s", rootfs) + + spec.Root.Path = rootfs + + if *dumpSpec != "" { + d, err := os.Create(*dumpSpec) + if err != nil { + log.WithError(err).Fatal("failed to open file for spec dump") + } + enc := json.NewEncoder(d) + enc.SetIndent("", " ") + if err := enc.Encode(&spec); err != nil { + log.WithError(err).Fatal("failed to write spec dump") + } + + } + + ctr, err := client.NewContainer(ctx, service, containerd.WithSpec(spec)) + if err != nil { + log.WithError(err).Fatal("failed to create container") + } + + 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") + } + return &containerd.IO{ + Stdin: "/dev/null", + Stdout: logfile, + Stderr: logfile, + Terminal: false, + }, nil + } + + 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") + } + + 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") + } + + log.Debugf("Started %s pid %d", ctr.ID(), task.Pid()) +} diff --git a/pkg/containerd/etc/containerd/config.toml b/pkg/containerd/etc/containerd/config.toml index 74e36918b..c5884e193 100644 --- a/pkg/containerd/etc/containerd/config.toml +++ b/pkg/containerd/etc/containerd/config.toml @@ -1,6 +1,7 @@ state = "/run/containerd" root = "/var/lib/containerd" -snapshotter = "overlay" +snapshotter = "io.containerd.snapshotter.v1.overlayfs" +differ = "io.containerd.differ.v1.base-diff" subreaper = false [grpc] diff --git a/pkg/getty/Dockerfile b/pkg/getty/Dockerfile index 0292384cf..defd12c3f 100644 --- a/pkg/getty/Dockerfile +++ b/pkg/getty/Dockerfile @@ -28,4 +28,4 @@ COPY --from=mirror /out/ / COPY usr/ /usr/ COPY etc/ /etc/ CMD ["/usr/bin/rungetty.sh"] -LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/etc:/hostroot/etc","/tmp/ctr:/tmp/ctr", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' +LABEL org.mobyproject.config='{"pid": "host", "net":"host", "binds": ["/run:/run", "/etc:/hostroot/etc", "/usr/bin/ctr:/usr/bin/ctr", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/dist:/usr/bin/dist", "/var:/var","/containers:/containers","/dev:/dev","/sys:/sys"], "capabilities": ["all"]}' diff --git a/pkg/init/etc/init.d/010-containerd b/pkg/init/etc/init.d/010-containerd index afae70c7f..8ec251290 100755 --- a/pkg/init/etc/init.d/010-containerd +++ b/pkg/init/etc/init.d/010-containerd @@ -34,13 +34,8 @@ if [ -d /containers/services ] then for f in $(find /containers/services -mindepth 1 -maxdepth 1 | sort) do - base="$(basename $f)" /bin/mount --bind "$f/rootfs" "$f/rootfs" mount -o remount,rw "$f/rootfs" - log="/var/log/$base.log" - ctr run --runtime-config "$f/config.json" --rootfs "$f/rootfs" --id "$(basename $f)" $log >$log & - printf " - $base\n" + service start "$(basename $f)" done fi - -wait diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 9fa19bc94..b1242f01d 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 7bf1db5a8..9f62e945a 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:b3740303f3d1e5689a84c87b7dfb48fd2a40a192 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 7dd4b8911..bba91eeff 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 2f04500e6..47675a6c7 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -26,7 +26,7 @@ onboot: - /var:/var:rshared,rbind services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index a47474bab..076cdd1ac 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 # with runc, logwrite, startmemlogd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 5e0780b07..1e6915b51 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: sysctl image: linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018 @@ -30,7 +30,7 @@ services: - name: sshd image: "linuxkit/sshd:abc1f5e096982ebc3fb61c506aed3ac9c2ae4d55" - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true files: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 5d6bdbb70..ae92b6198 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:2599bcd5013ce5962aa155ee8929c26160de13bd - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl @@ -16,7 +16,7 @@ onboot: command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty - image: "linuxkit/getty:886d35fe30c47750e8cfbf2f73016e9d2cc6361a" + image: "linuxkit/getty:d0765e0a14733f9454010ac109a7c846a4e67fc5" env: - INSECURE=true - name: rngd @@ -34,7 +34,8 @@ files: contents: | state = "/run/containerd" root = "/var/lib/containerd" - snapshotter = "overlay" + snapshotter = "io.containerd.snapshotter.v1.overlayfs" + differ = "io.containerd.differ.v1.base-diff" subreaper = false [grpc] diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index e1af5a03b..5d158de3d 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:1b8a7e394d2ec2f1fdb4d67645829d1b5bdca037 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 0e27e0381..162852e0e 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" 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 c8b8c7c25..ba70b8e84 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,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" 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 987e9c4c7..afc6a0979 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,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" 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 c8b8c7c25..ba70b8e84 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,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml index c8b8c7c25..ba70b8e84 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml index c8b8c7c25..ba70b8e84 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" 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 68625908a..890990de4 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" 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 c8b8c7c25..ba70b8e84 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,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml index ae6f21ab8..1ae34aa05 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test-kernel-config.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.4.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml index 27e774e8f..109a9198f 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test-kernel-config.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml index ff61d9106..4cff3d755 100644 --- a/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml +++ b/test/cases/020_kernel/003_config_4.11.x/test-kernel-config.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.11.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: check-kernel-config image: "linuxkit/test-kernel-config:2acaa564c1801dd2ae1546c70c472dc58ac030a1" diff --git a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml index db2f6ea8b..31b3dc457 100644 --- a/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml +++ b/test/cases/020_kernel/010_kmod_4.9.x/kmod.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: check image: "kmod-test" 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 3e71d4f6b..676912f4d 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 @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: sysctl diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 072d56981..286edd365 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: test image: "alpine:3.6" diff --git a/test/cases/040_packages/002_binfmt/test-binfmt.yml b/test/cases/040_packages/002_binfmt/test-binfmt.yml index 10d22670b..ec89b116f 100644 --- a/test/cases/040_packages/002_binfmt/test-binfmt.yml +++ b/test/cases/040_packages/002_binfmt/test-binfmt.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: binfmt image: "linuxkit/binfmt:8ac5535f57f0c6f5fe88317b9d22a7677093c765" diff --git a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml index 69e615107..b3669f245 100644 --- a/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml +++ b/test/cases/040_packages/003_ca-certificates/test-ca-certificates.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 - linuxkit/ca-certificates:75cf419fb58770884c3464eb687ec8dfc704169d onboot: - name: test diff --git a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml index 1d6e35792..d6008c800 100644 --- a/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml +++ b/test/cases/040_packages/004_dhcpcd/test-dhcpcd.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1" diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index ccbbe4270..fd49a20e0 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: mkimage image: "linuxkit/mkimage:f4bf0c24261f7d120c8674892805ab3054eb8ac3" diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 1089b3009..4a977f146 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: poweroff image: "linuxkit/poweroff:7404cf2295df89ccfa2dda41997a28307a90cf28" diff --git a/test/cases/040_packages/019_sysctl/test-sysctl.yml b/test/cases/040_packages/019_sysctl/test-sysctl.yml index f38ef281d..3125a4248 100644 --- a/test/cases/040_packages/019_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/019_sysctl/test-sysctl.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: sysctl image: "linuxkit/sysctl:3aa6bc663c2849ef239be7d941d3eaf3e6fcc018" diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 17bcad5c9..fe3f69bb3 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,9 +2,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:3a4e6cbf15470f62501b019b55e1caac5ee7689f - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: ltp image: "linuxkit/test-ltp:6df23ac196332cafb9c0f8e32f328e22d612267d" diff --git a/test/hack/test.yml b/test/hack/test.yml index a993078d5..200b640e0 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,9 +4,9 @@ kernel: image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - - linuxkit/init:781cec2360313a6d4aca25f5e90623294f8432f7 + - linuxkit/init:17693d233dd009b2a3a8d23673cb85969e1dce80 - linuxkit/runc:2649198589ef0020d99f613adaeda45ce0093a38 - - linuxkit/containerd:b50181bc6e0084e5fcd6b6ad3cf433c4f66cae5a + - linuxkit/containerd:04880f344709830aa4c938baa765764e644fc973 onboot: - name: dhcpcd image: "linuxkit/dhcpcd:7d2b8aaaf20c24ad7d11a5ea2ea5b4a80dc966f1"