Merge pull request #3558 from deitch/containerd-141

containerd 1.4.1 from latest version of lkt/alpine
This commit is contained in:
Avi Deitcher 2020-10-08 10:39:44 +03:00 committed by GitHub
commit a1427d0b7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 50 additions and 50 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -5,7 +5,7 @@ kernel:
init:
- linuxkit/init:v0.8
- linuxkit/runc:v0.8
- linuxkit/containerd:v0.8
- linuxkit/containerd:a4aa19c608556f7d786852557c36136255220c1f
onboot:
- name: dhcpcd

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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:

View File

@ -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

View File

@ -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