From 73cf544d330e901fa61f2ad634e2a782d2b2ce06 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 9 Nov 2017 09:29:18 +0000 Subject: [PATCH 1/4] alpine: bump to containerd containerd-v1.0.0-beta.3 Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 10 +++++----- tools/alpine/versions.x86_64 | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 7a2e6fadd..638af6408 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -46,7 +46,7 @@ RUN go get -u github.com/LK4D4/vndr # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git -ENV CONTAINERD_COMMIT=v1.0.0-beta.2 +ENV CONTAINERD_COMMIT=v1.0.0-beta.3 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index f17c42ded..aa18c677c 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:ae5646c043bb48cee3fa428714ee27dda2f57812-arm64 +# linuxkit/alpine:941b953167b50becb3b34992df9cd9791edb1a08-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -114,7 +114,7 @@ libcap-2.25-r1 libcap-ng-0.7.8-r0 libcap-ng-dev-0.7.8-r0 libcom_err-1.43.4-r0 -libcrypto1.0-1.0.2k-r0 +libcrypto1.0-1.0.2m-r0 libcurl-7.56.1-r0 libdrm-2.4.80-r0 libedit-20170329.3.1-r2 @@ -159,7 +159,7 @@ libseccomp-2.3.2-r0 libseccomp-dev-2.3.2-r0 libsmartcols-2.28.2-r2 libssh2-1.8.0-r1 -libssl1.0-1.0.2k-r0 +libssl1.0-1.0.2m-r0 libstdc++-6.3.0-r4 libtasn1-4.10-r2 libtirpc-1.0.1-r1 @@ -202,8 +202,8 @@ openntpd-6.0_p1-r3 openrc-0.24.1-r2 openssh-keygen-7.5_p1-r1 openssh-server-7.5_p1-r1 -openssl-1.0.2k-r0 -openssl-dev-1.0.2k-r0 +openssl-1.0.2m-r0 +openssl-dev-1.0.2m-r0 opus-1.1.4-r0 p11-kit-0.23.2-r1 patch-2.7.5-r1 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index dc21d457f..a733d0320 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:0fb5b5e7952d22eeae57607493168e679a4a0c0a-amd64 +# linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28-amd64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -117,7 +117,7 @@ libcap-2.25-r1 libcap-ng-0.7.8-r0 libcap-ng-dev-0.7.8-r0 libcom_err-1.43.4-r0 -libcrypto1.0-1.0.2k-r0 +libcrypto1.0-1.0.2m-r0 libcurl-7.56.1-r0 libdrm-2.4.80-r0 libedit-20170329.3.1-r2 @@ -164,7 +164,7 @@ libseccomp-2.3.2-r0 libseccomp-dev-2.3.2-r0 libsmartcols-2.28.2-r2 libssh2-1.8.0-r1 -libssl1.0-1.0.2k-r0 +libssl1.0-1.0.2m-r0 libstdc++-6.3.0-r4 libtasn1-4.10-r2 libtirpc-1.0.1-r1 @@ -209,8 +209,8 @@ openntpd-6.0_p1-r3 openrc-0.24.1-r2 openssh-keygen-7.5_p1-r1 openssh-server-7.5_p1-r1 -openssl-1.0.2k-r0 -openssl-dev-1.0.2k-r0 +openssl-1.0.2m-r0 +openssl-dev-1.0.2m-r0 opus-1.1.4-r0 ovmf-0.0.20161115-r1 p11-kit-0.23.2-r1 From 61ca7518400166ac16b73102f98c45ce9422b197 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 9 Nov 2017 09:54:51 +0000 Subject: [PATCH 2/4] Bump packages to new alpine w/ containerd v1.0.0-beta.3 Signed-off-by: Ian Campbell --- pkg/containerd/Dockerfile | 2 +- pkg/init/Dockerfile | 2 +- test/pkg/containerd/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index 266e9ba7b..da7dc62cd 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 as alpine +FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 as alpine RUN apk add tzdata WORKDIR $GOPATH/src/github.com/containerd/containerd diff --git a/pkg/init/Dockerfile b/pkg/init/Dockerfile index 238912b0c..adfd8c1e5 100644 --- a/pkg/init/Dockerfile +++ b/pkg/init/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS build +FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 AS build RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers ADD usermode-helper.c ./ diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 8aca51015..90ed3637c 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS mirror +FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 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 a5f4da2ebb84c387570e305b616f0b162e8bb0a1 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 9 Nov 2017 10:05:29 +0000 Subject: [PATCH 3/4] Bump yml for containerd v1.0.0-beta.3 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/openstack.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- examples/vultr.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/kubernetes/kube.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.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 4 ++-- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 4009de9d8..eeae1f09a 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -6,7 +6,7 @@ init: - linuxkit/vpnkit-expose-port:15c56c57ac9a7adeec20b34f36f2bc165c347679 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: # support metadata for optional config in /var/config diff --git a/examples/aws.yml b/examples/aws.yml index 7d41f3e2b..9e71df8ef 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/azure.yml b/examples/azure.yml index 6f68c0902..3c854d46f 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/docker.yml b/examples/docker.yml index dbd705fcb..093781420 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/gcp.yml b/examples/gcp.yml index 8e939c88a..8716790d3 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/getty.yml b/examples/getty.yml index b2f3e1b40..bdf294172 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/minimal.yml b/examples/minimal.yml index f33988cab..d0886cf46 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf onboot: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index f553a1f2f..06d52fb63 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf services: - name: getty image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa diff --git a/examples/openstack.yml b/examples/openstack.yml index 23168587a..9a12f777f 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/packet.yml b/examples/packet.yml index 397a5a710..8b267c034 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: rngd1 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 75f9c993a..741e91e6c 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf onboot: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e diff --git a/examples/sshd.yml b/examples/sshd.yml index 01f2a5907..392ab93c5 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/swap.yml b/examples/swap.yml index a1fbf3760..0f3daa526 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/tpm.yml b/examples/tpm.yml index ede130955..e48f486be 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/vmware.yml b/examples/vmware.yml index a1199927c..d6d3fef78 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 8a3b53bdb..15c78e7dd 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf onboot: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e diff --git a/examples/vsudd.yml b/examples/vsudd.yml index 51844e637..2b5423898 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf onboot: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e diff --git a/examples/vultr.yml b/examples/vultr.yml index 2da1f9388..78896bd39 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/examples/wireguard.yml b/examples/wireguard.yml index fa73f206e..84f39b577 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/linuxkit.yml b/linuxkit.yml index da087ee15..5baff0e0f 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index afddc36a8..c8ee4edf5 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 8651aef0a..d33910daf 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 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 0aa253465..be4c01f10 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:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf services: - name: acpid image: linuxkit/acpid:168f871c7211c9d5e96002d53cb497b26e2d622b diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 2e36fe1ef..04faec5b6 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: sysctl diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 0df2d27e9..eb1c19641 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: dhcpcd @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a command: ["/usr/bin/mountie", "/var/lib"] - name: test - image: linuxkit/test-containerd:9fdfba5efad713b869389f10ee860a11757f9bf2 + image: linuxkit/test-containerd:a2384bb503c16b791986710a2636c4640bfdb31e - name: poweroff image: linuxkit/poweroff:280bd01daa8776fbe1f4d912977f1886b8374834 trust: diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index b9ac038da..1bf4dccb0 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 38801c635..380b3239c 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 onboot: - name: dhcpcd diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 80997cab4..3327f2aaa 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -4,7 +4,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf onboot: - name: ltp image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd diff --git a/test/hack/test.yml b/test/hack/test.yml index b13999ccc..9b43ad8c4 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -6,7 +6,7 @@ kernel: init: - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - - linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff + - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf onboot: - name: dhcpcd image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e From eb491824bafedd2cc2b04229d5797d18839f0d3f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 9 Nov 2017 13:50:51 +0000 Subject: [PATCH 4/4] Update `linuxkit.packages.getty-containerd` for `ctr` changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `ctr pull` → `ctr images pull` Signed-off-by: Ian Campbell --- test/cases/040_packages/007_getty-containerd/test.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/040_packages/007_getty-containerd/test.exp b/test/cases/040_packages/007_getty-containerd/test.exp index c6fd4b7f6..4fd32f9fc 100755 --- a/test/cases/040_packages/007_getty-containerd/test.exp +++ b/test/cases/040_packages/007_getty-containerd/test.exp @@ -40,22 +40,22 @@ expect { expect { timeout { - puts "FAILED ctr pull" + puts "FAILED ctr images pull" exec kill -9 $pid exit 1 } $prompt { - send "ctr pull $image\n" + send "ctr images pull $image\n" } } expect { timeout { - puts "FAILED ctr pull" + puts "FAILED ctr images pull" exec kill -9 $pid exit 1 } $prompt { - puts "SUCCESS ctr pull" + puts "SUCCESS ctr images pull" send "ctr run -t $image test\n" } }