Merge pull request #3558 from deitch/containerd-141

containerd 1.4.1 from latest version of lkt/alpine
2025-07-26 04:03:11 +00:00 · 2020-10-08 10:39:44 +03:00 · 2020-10-08 10:39:44 +03:00 · a1427d0b7b
commit a1427d0b7b
parent e305e52b41 3143c04de9
50 changed files with 50 additions and 50 deletions
--- a/examples/addbinds.yml
+++ b/examples/addbinds.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:7195dc244cd92af01fd0895fd204249a6114c5e2
  - linuxkit/runc:f79954950022fea76b8b6f10de58cb48e4fb3878
-  - linuxkit/containerd:8ee7a0d636fff9df7e13076f5492d06274e5f644
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:abfc6701b9ca17e34ac9439ce5946a247e720ff5
 onboot:
  - name: sysctl
--- a/examples/aws.yml
+++ b/examples/aws.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/azure.yml
+++ b/examples/azure.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/cadvisor.yml
+++ b/examples/cadvisor.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/dm-crypt-loop.yml
+++ b/examples/dm-crypt-loop.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/dm-crypt.yml
+++ b/examples/dm-crypt.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/docker-for-mac.yml
+++ b/examples/docker-for-mac.yml
@ -6,7 +6,7 @@ init:
  - linuxkit/vpnkit-expose-port:v0.8 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  # support metadata for optional config in /run/config
--- a/examples/docker.yml
+++ b/examples/docker.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/gcp.yml
+++ b/examples/gcp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/getty.yml
+++ b/examples/getty.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/hetzner.yml
+++ b/examples/hetzner.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
  - linuxkit/firmware:v0.8
 onboot:
--- a/examples/hostmount-writeable-overlay.yml
+++ b/examples/hostmount-writeable-overlay.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/influxdb-os.yml
+++ b/examples/influxdb-os.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: dhcpcd
--- a/examples/logging.yml
+++ b/examples/logging.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
  - linuxkit/memlogd:v0.8
 onboot:
--- a/examples/minimal.yml
+++ b/examples/minimal.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:v0.8
--- a/examples/node_exporter.yml
+++ b/examples/node_exporter.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 services:
  - name: getty
    image: linuxkit/getty:v0.8
--- a/examples/openstack.yml
+++ b/examples/openstack.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/packet.yml
+++ b/examples/packet.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
  - linuxkit/firmware:v0.8
 onboot:
--- a/examples/redis-os.yml
+++ b/examples/redis-os.yml
@ -6,7 +6,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:v0.8
--- a/examples/rt-for-vmware.yml
+++ b/examples/rt-for-vmware.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/scaleway.yml
+++ b/examples/scaleway.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/sshd.yml
+++ b/examples/sshd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/static-ip.yml
+++ b/examples/static-ip.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: ip
    image: linuxkit/ip:v0.8
--- a/examples/swap.yml
+++ b/examples/swap.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/tpm.yml
+++ b/examples/tpm.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/vmware.yml
+++ b/examples/vmware.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/vpnkit-forwarder.yml
+++ b/examples/vpnkit-forwarder.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:v0.8
--- a/examples/vsudd-containerd.yml
+++ b/examples/vsudd-containerd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:v0.8
--- a/examples/vultr.yml
+++ b/examples/vultr.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/examples/wireguard.yml
+++ b/examples/wireguard.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/linuxkit.yml
+++ b/linuxkit.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/pkg/containerd/Dockerfile
+++ b/pkg/containerd/Dockerfile
@ -1,4 +1,4 @@
-FROM linuxkit/alpine:e2391e0b164c57db9f6c4ae110ee84f766edc430 as alpine
+FROM linuxkit/alpine:a3d78322152a8b341bdaecfe182a2689fdbdee53 as alpine
 RUN apk add tzdata

 WORKDIR $GOPATH/src/github.com/containerd/containerd
--- a/projects/compose/compose-dynamic.yml
+++ b/projects/compose/compose-dynamic.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/projects/compose/compose-static.yml
+++ b/projects/compose/compose-static.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/projects/ima-namespace/ima-namespace.yml
+++ b/projects/ima-namespace/ima-namespace.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
  - linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
 onboot:
--- a/projects/memorizer/memorizer.yml
+++ b/projects/memorizer/memorizer.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:v0.8
--- a/projects/miragesdk/examples/fdd.yml
+++ b/projects/miragesdk/examples/fdd.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
  - samoht/fdd
 onboot:
--- a/projects/miragesdk/examples/mirage-dhcp.yml
+++ b/projects/miragesdk/examples/mirage-dhcp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: sysctl
    image: linuxkit/sysctl:v0.8
--- a/projects/okernel/examples/okernel_simple.yaml
+++ b/projects/okernel/examples/okernel_simple.yaml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/projects/shiftfs/shiftfs.yml
+++ b/projects/shiftfs/shiftfs.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- a/test/cases/000_build/010_reproducible/test.yml
+++ b/test/cases/000_build/010_reproducible/test.yml
@ -5,7 +5,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f

 onboot:
  - name: dhcpcd
--- 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:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 services:
  - name: acpid
    image: linuxkit/acpid:v0.8
--- 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:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: sysctl
--- 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:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: dhcpcd
--- 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:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: dhcpcd
--- 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:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
 onboot:
  - name: dhcpcd
--- a/test/cases/040_packages/030_logwrite/test.yml
+++ b/test/cases/040_packages/030_logwrite/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
  - linuxkit/memlogd:v0.8
 services:
--- a/test/cases/040_packages/031_kmsg/test.yml
+++ b/test/cases/040_packages/031_kmsg/test.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
  - linuxkit/ca-certificates:v0.8
  - linuxkit/memlogd:v0.8
 services:
--- a/test/hack/test-ltp.yml
+++ b/test/hack/test-ltp.yml
@ -4,7 +4,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: ltp
    image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd
--- a/test/hack/test.yml
+++ b/test/hack/test.yml
@ -6,7 +6,7 @@ kernel:
 init:
  - linuxkit/init:v0.8
  - linuxkit/runc:v0.8
-  - linuxkit/containerd:v0.8
+  - linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
 onboot:
  - name: dhcpcd
    image: linuxkit/dhcpcd:v0.8