From c8164c0a6e982b887a7af136796dada4d640d7fa Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 27 Jul 2017 10:40:31 +0100 Subject: [PATCH 1/5] alpine: Update to containerd v1.0.0-alpha2 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 5 ++--- tools/alpine/versions.x86_64 | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 865d36c1a..9706bb4bb 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -52,6 +52,5 @@ COPY --from=mirror /Dockerfile /Dockerfile RUN apk update && apk upgrade -a # Update `FROM` in `test/pkg/containerd/Dockerfile` when changing this. -# v1.0.0-alpha1 plus https://github.com/containerd/containerd/pull/1141 -ENV CONTAINERD_REPO=https://github.com/ijc/containerd.git -ENV CONTAINERD_COMMIT=d42cb88ba2b08d2ca6c8c017d629b394bf1dd08c +ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git +ENV CONTAINERD_COMMIT=v1.0.0-alpha2 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index f0a6e7a00..bfe7c3f68 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:77c8dfc5860012c869a19d7a2c68e701469692c8 +# linuxkit/alpine:cb6a0b2b068d892996ebadae999d9baf6e08be5b # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -91,14 +91,14 @@ libattr-2.4.47-r6 libblkid-2.28.2-r2 libburn-1.4.6-r0 libbz2-1.0.6-r5 -libc-dev-0.7.1-r0 -libc-utils-0.7.1-r0 libcap-2.25-r1 libcap-ng-0.7.8-r0 libcap-ng-dev-0.7.8-r0 +libc-dev-0.7.1-r0 libcom_err-1.43.4-r0 libcrypto1.0-1.0.2k-r0 libcurl-7.54.0-r0 +libc-utils-0.7.1-r0 libdrm-2.4.80-r0 libedit-20170329.3.1-r2 libelf-0.8.13-r2 @@ -131,10 +131,10 @@ libpcap-1.8.1-r0 libpciaccess-0.13.4-r1 libpng-1.6.29-r1 libressl-2.5.4-r0 -libressl-dev-2.5.4-r0 libressl2.5-libcrypto-2.5.4-r0 libressl2.5-libssl-2.5.4-r0 libressl2.5-libtls-2.5.4-r0 +libressl-dev-2.5.4-r0 libsasl-2.1.26-r10 libseccomp-2.3.2-r0 libseccomp-dev-2.3.2-r0 @@ -175,12 +175,12 @@ ncurses-terminfo-base-6.0-r7 nettle-3.3-r0 npth-1.2-r0 oniguruma-6.2.0-r0 -open-vm-tools-10.1.0-r7 openntpd-6.0_p1-r3 openrc-0.24.1-r2 openssh-keygen-7.5_p1-r1 openssh-server-7.5_p1-r1 openssl-dev-1.0.2k-r0 +open-vm-tools-10.1.0-r7 opus-1.1.4-r0 ovmf-0.0.20161115-r1 p11-kit-0.23.2-r1 From 8eb6709a3cadf6cd5ef4788fd8b80f1c5e13c992 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 27 Jul 2017 10:44:01 +0100 Subject: [PATCH 2/5] containerd: Bump to new alpine (with v1.0.0-alpha2) The logrus import path has changed, so adjust. Also there is a minor API change to the containerd.IOCreation() function spec, it now takes a string id which we can ignore. Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- pkg/containerd/cmd/service/main.go | 2 +- pkg/containerd/cmd/service/start.go | 4 ++-- pkg/containerd/cmd/service/system_init.go | 2 +- test/pkg/containerd/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 28c1386cc..c35d201df 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:a39a433162a873519910a07beeb3e8db22529956 as alpine +FROM linuxkit/alpine:cb6a0b2b068d892996ebadae999d9baf6e08be5b as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/pkg/containerd/cmd/service/main.go b/pkg/containerd/cmd/service/main.go index bf68a3f2c..d2477d999 100644 --- a/pkg/containerd/cmd/service/main.go +++ b/pkg/containerd/cmd/service/main.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - log "github.com/Sirupsen/logrus" + log "github.com/sirupsen/logrus" ) const ( diff --git a/pkg/containerd/cmd/service/start.go b/pkg/containerd/cmd/service/start.go index 6e37b3b99..8924c953b 100644 --- a/pkg/containerd/cmd/service/start.go +++ b/pkg/containerd/cmd/service/start.go @@ -9,10 +9,10 @@ import ( "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" + log "github.com/sirupsen/logrus" ) func startCmd(args []string) { @@ -98,7 +98,7 @@ func start(service, sock, path, dumpSpec string) (string, uint32, string, error) return "", 0, "failed to create container", err } - io := func() (*containerd.IO, error) { + io := func(id string) (*containerd.IO, error) { logfile := filepath.Join("/var/log", service+".log") // We just need this to exist. if err := ioutil.WriteFile(logfile, []byte{}, 0600); err != nil { diff --git a/pkg/containerd/cmd/service/system_init.go b/pkg/containerd/cmd/service/system_init.go index c450d5f40..e530e54a5 100644 --- a/pkg/containerd/cmd/service/system_init.go +++ b/pkg/containerd/cmd/service/system_init.go @@ -11,11 +11,11 @@ import ( "syscall" "time" - log "github.com/Sirupsen/logrus" "github.com/containerd/containerd" "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/namespaces" "github.com/pkg/errors" + log "github.com/sirupsen/logrus" ) func cleanupTask(ctx context.Context, ctr containerd.Container) error { diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 63d3bf086..b7b88ea7e 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror +FROM linuxkit/alpine:3b03eeb1b4cc58800b9f3608b6f148a044227df5 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) From 017d3304fc1669655efe964f2323d9a53c2dd217 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 27 Jul 2017 11:06:09 +0100 Subject: [PATCH 3/5] Update yml after containerd bump Signed-off-by: Ian Campbell --- 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 +- test/pkg/containerd/Dockerfile | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index c9a25e7bf..98ec7be50 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:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b onboot: # support metadata for optional config in /var/config - name: metadata diff --git a/examples/aws.yml b/examples/aws.yml index be5eb7a3e..06cee4668 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index cb54e660b..22a36de40 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index d0da8273d..7c3ce7d7e 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 42167397c..ec18c0fca 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index 9f08094a1..3788c6f49 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index 7a2a5d874..5371e3aba 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b onboot: - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 94323aea3..9711b20de 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b services: - name: getty image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595 diff --git a/examples/packet.yml b/examples/packet.yml index 43b94e012..14785f245 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 2ff1cb204..f6896b5ff 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b onboot: - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b diff --git a/examples/sshd.yml b/examples/sshd.yml index 767cf203c..7296ee5d8 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index ae3185a58..575899fe8 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index 83b9f452b..50538d0e8 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 6919e4b0f..76621569f 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b onboot: - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b diff --git a/examples/vsudd.yml b/examples/vsudd.yml index f9be1cbc5..bece4253a 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b onboot: - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b diff --git a/examples/vultr.yml b/examples/vultr.yml index 7fab7e7e3..8f5d1b751 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index b45f25a6c..b6199a930 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 7e32fc6e2..4dc833635 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 8e83d82fa..2904ce4d5 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index a19894f1b..2bcaf8687 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 7edbd8a66..91c9eb42a 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29 onboot: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 153978449..f6bde2fce 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index c1f315165..1b79da21a 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index e9e6e21ac..d1046eddb 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:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 1b953a745..9a1611f5c 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf - samoht/fdd onboot: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index a59ea0e8a..b808dd58b 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 8222fb151..2b6202d76 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index ec59634fe..1920878ba 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index e84c9b6d9..59bf5f71b 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - 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 1099a9984..391971ce7 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:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b 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 12cf31087..d279fb1be 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:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - 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 bb9443e27..2bb6ee159 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:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - 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 53221be35..8455a5ea8 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:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index d1a2b1857..c6caafe7c 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b onboot: - name: ltp image: linuxkit/test-ltp:b8ad3dfd0998ddff4fd47b3f693d2a4aa93ab7a4 diff --git a/test/hack/test.yml b/test/hack/test.yml index 11676255f..3621e62b2 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059 - linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f - - linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f + - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b onboot: - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index b7b88ea7e..51296392f 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:3b03eeb1b4cc58800b9f3608b6f148a044227df5 AS mirror +FROM linuxkit/alpine:cb6a0b2b068d892996ebadae999d9baf6e08be5b AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) From 88ab78874967ff91d344e676e21f9febc260b5e5 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 27 Jul 2017 11:39:49 +0100 Subject: [PATCH 4/5] tests: reenable linuxkit.packages.containerd The newest tests actually run containerd and therefore have some additional requirements: - containerd + shim + runc binaries are needed. We bind these in from the host. The test code should, by design, be from matching containerd source, assuming we remember to update test/pkg/container/Dockerfile when we bump CONTAINERD_COMMIT. 5217b9973b9a79fc04fff2e7163afc7ade56c328 added a reminder to do so. - the tests need networking (to pull images). So add dhcp to onboot and bind /etc/resolv.conf into the test container. - running containers requires a writeable cgroup mount. - containerd wants /etc/localtime, so install the UTC one (as we do in pkg/containerd). The test image already has `net: host` and `capabilities: all`. Signed-off-by: Ian Campbell --- test/cases/040_packages/003_containerd/test-containerd.yml | 6 ++++-- test/cases/040_packages/003_containerd/test.sh | 2 +- test/pkg/containerd/Dockerfile | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/test/cases/040_packages/003_containerd/test-containerd.yml b/test/cases/040_packages/003_containerd/test-containerd.yml index 2bb6ee159..7c26e7b72 100644 --- a/test/cases/040_packages/003_containerd/test-containerd.yml +++ b/test/cases/040_packages/003_containerd/test-containerd.yml @@ -7,13 +7,15 @@ init: - linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b - linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf onboot: + - name: dhcpcd + image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b + command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: test - image: linuxkit/test-containerd:0e350ce958b379b9ddb2bcdd22aaf4508f6ddbc3 + image: linuxkit/test-containerd:dd3f2ba599c70994ba875e7c86c04df2967e3144 - name: poweroff image: linuxkit/poweroff:3845c4d64d47a1ea367806be5547e44594b0fa91 trust: org: - linuxkit - diff --git a/test/cases/040_packages/003_containerd/test.sh b/test/cases/040_packages/003_containerd/test.sh index f7ecde0b1..3e9729985 100644 --- a/test/cases/040_packages/003_containerd/test.sh +++ b/test/cases/040_packages/003_containerd/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Run containerd test -# LABELS: skip +# LABELS: # REPEAT: set -e diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 51296392f..97d1a2a16 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -14,8 +14,10 @@ RUN apk add --no-cache --initdb -p /out \ linux-headers \ make \ musl \ - util-linux + util-linux \ + tzdata RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache +RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime FROM scratch COPY --from=mirror /out/ / @@ -29,4 +31,4 @@ RUN git checkout $CONTAINERD_COMMIT ADD run.sh ./run.sh ENTRYPOINT ["/bin/sh", "run.sh"] -LABEL org.mobyproject.config='{"net": "host", "capabilities": ["all"], "tmpfs": ["/tmp:exec"], "binds": ["/dev:/dev"]}' +LABEL org.mobyproject.config='{"net": "host", "capabilities": ["all"], "tmpfs": ["/tmp:exec"], "binds": ["/dev:/dev", "/etc/resolv.conf:/etc/resolv.conf", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/containerd:/usr/bin/containerd", "/usr/bin/containerd-shim:/usr/bin/containerd-shim"], "mounts": [{"type": "cgroup", "options": ["rw","nosuid","noexec","nodev","relatime"]}],}' From 886870c93512babc718402cec7689f58ddb6d153 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 27 Jul 2017 12:14:36 +0100 Subject: [PATCH 5/5] alpine: Use C locale to sort the versions file. This should reduce instability due to different people's environment. This undoes the reordering done by "alpine: Update to containerd v1.0.0-alpha2", leaving just the hash update (as expected). Signed-off-by: Ian Campbell --- tools/alpine/Makefile | 2 +- tools/alpine/versions.x86_64 | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/alpine/Makefile b/tools/alpine/Makefile index 686d59288..aa2786e5d 100644 --- a/tools/alpine/Makefile +++ b/tools/alpine/Makefile @@ -50,7 +50,7 @@ hash: Makefile iid versions.$(ARCH): Makefile hash iid echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(ARCH) - docker run --rm $(shell cat iid) find /mirror -name '*.apk' -exec basename '{}' .apk \; | sort | (echo '# automatically generated list of installed packages'; cat -) >> versions.$(ARCH) + docker run --rm $(shell cat iid) find /mirror -name '*.apk' -exec basename '{}' .apk \; | LANG=C sort | (echo '# automatically generated list of installed packages'; cat -) >> versions.$(ARCH) push: hash iid versions.$(ARCH) docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \ diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index bfe7c3f68..ac75322cf 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -91,14 +91,14 @@ libattr-2.4.47-r6 libblkid-2.28.2-r2 libburn-1.4.6-r0 libbz2-1.0.6-r5 +libc-dev-0.7.1-r0 +libc-utils-0.7.1-r0 libcap-2.25-r1 libcap-ng-0.7.8-r0 libcap-ng-dev-0.7.8-r0 -libc-dev-0.7.1-r0 libcom_err-1.43.4-r0 libcrypto1.0-1.0.2k-r0 libcurl-7.54.0-r0 -libc-utils-0.7.1-r0 libdrm-2.4.80-r0 libedit-20170329.3.1-r2 libelf-0.8.13-r2 @@ -131,10 +131,10 @@ libpcap-1.8.1-r0 libpciaccess-0.13.4-r1 libpng-1.6.29-r1 libressl-2.5.4-r0 +libressl-dev-2.5.4-r0 libressl2.5-libcrypto-2.5.4-r0 libressl2.5-libssl-2.5.4-r0 libressl2.5-libtls-2.5.4-r0 -libressl-dev-2.5.4-r0 libsasl-2.1.26-r10 libseccomp-2.3.2-r0 libseccomp-dev-2.3.2-r0 @@ -175,12 +175,12 @@ ncurses-terminfo-base-6.0-r7 nettle-3.3-r0 npth-1.2-r0 oniguruma-6.2.0-r0 +open-vm-tools-10.1.0-r7 openntpd-6.0_p1-r3 openrc-0.24.1-r2 openssh-keygen-7.5_p1-r1 openssh-server-7.5_p1-r1 openssl-dev-1.0.2k-r0 -open-vm-tools-10.1.0-r7 opus-1.1.4-r0 ovmf-0.0.20161115-r1 p11-kit-0.23.2-r1