github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2699 from ijc/containerd-v1.0.0-beta.3

Browse Source 
Bump to containerd v1.0.0-beta.3
This commit is contained in:
Ian Campbell 2017-11-09 15:11:11 +00:00 committed by GitHub
commit abe13b1f44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blueprints/docker-for-mac/base.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/vpnkit-expose-port:15c56c57ac9a7adeec20b34f36f2bc165c347679 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - linuxkit/vpnkit-expose-port:15c56c57ac9a7adeec20b34f36f2bc165c347679 # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
# support metadata for optional config in /var/config # support metadata for optional config in /var/config

2
examples/aws.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/azure.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/docker.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/gcp.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/getty.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/minimal.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

2
examples/node_exporter.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
services: services:
- name: getty - name: getty
image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa

2
examples/openstack.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/packet.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: rngd1 - name: rngd1

2
examples/redis-os.yml
View File

@ -6,7 +6,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

2
examples/sshd.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/swap.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/tpm.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/vmware.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/vpnkit-forwarder.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

2
examples/vsudd.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

2
examples/vultr.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
examples/wireguard.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
linuxkit.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 as alpine FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 as alpine
RUN apk add tzdata RUN apk add tzdata
WORKDIR $GOPATH/src/github.com/containerd/containerd WORKDIR $GOPATH/src/github.com/containerd/containerd

2
pkg/init/Dockerfile
View File

@ -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 RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
ADD usermode-helper.c ./ ADD usermode-helper.c ./

2
projects/kubernetes/kube.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
projects/swarmd/swarmd.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
services: services:
- name: acpid - name: acpid
image: linuxkit/acpid:168f871c7211c9d5e96002d53cb497b26e2d622b image: linuxkit/acpid:168f871c7211c9d5e96002d53cb497b26e2d622b

2
test/cases/030_security/000_docker-bench/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
test/cases/040_packages/003_containerd/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: dhcpcd - name: dhcpcd
@ -18,7 +18,7 @@ onboot:
image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a image: linuxkit/mount:41685ecc8039643948e5dff46e17584753469a7a
command: ["/usr/bin/mountie", "/var/lib"] command: ["/usr/bin/mountie", "/var/lib"]
- name: test - name: test
image: linuxkit/test-containerd:9fdfba5efad713b869389f10ee860a11757f9bf2 image: linuxkit/test-containerd:a2384bb503c16b791986710a2636c4640bfdb31e
- name: poweroff - name: poweroff
image: linuxkit/poweroff:280bd01daa8776fbe1f4d912977f1886b8374834 image: linuxkit/poweroff:280bd01daa8776fbe1f4d912977f1886b8374834
trust: trust:

8
test/cases/040_packages/007_getty-containerd/test.exp
View File

@ -40,22 +40,22 @@ expect {
expect { expect {
timeout { timeout {
puts "FAILED ctr pull" puts "FAILED ctr images pull"
exec kill -9 $pid exec kill -9 $pid
exit 1 exit 1
} }
$prompt { $prompt {
send "ctr pull $image\n" send "ctr images pull $image\n"
} }
} }
expect { expect {
timeout { timeout {
puts "FAILED ctr pull" puts "FAILED ctr images pull"
exec kill -9 $pid exec kill -9 $pid
exit 1 exit 1
} }
$prompt { $prompt {
puts "SUCCESS ctr pull" puts "SUCCESS ctr images pull"
send "ctr run -t $image test\n" send "ctr run -t $image test\n"
} }
} }

2
test/cases/040_packages/007_getty-containerd/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: dhcpcd - name: dhcpcd

2
test/cases/040_packages/023_wireguard/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: dhcpcd - name: dhcpcd

2
test/hack/test-ltp.yml
View File

@ -4,7 +4,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
onboot: onboot:
- name: ltp - name: ltp
image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd

2
test/hack/test.yml
View File

@ -6,7 +6,7 @@ kernel:
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558
- linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f - linuxkit/runc:817fdc592eac6cb7804fa1721a43a7f6e23fb50f
- linuxkit/containerd:82be2bbb7cf83bab161ffe2a64624ba1107725ff - linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

2
test/pkg/containerd/Dockerfile
View File

@ -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/ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
# btrfs-progfs is required for btrfs test (mkfs.btrfs) # btrfs-progfs is required for btrfs test (mkfs.btrfs)
# util-linux is required for btrfs test (losetup) # util-linux is required for btrfs test (losetup)

2
tools/alpine/Dockerfile
View File

@ -46,7 +46,7 @@ RUN go get -u github.com/LK4D4/vndr
# Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and
# `test/pkg/containerd/Dockerfile` when changing this. # `test/pkg/containerd/Dockerfile` when changing this.
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git 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 && \ RUN mkdir -p $GOPATH/src/github.com/containerd && \
cd $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \
git clone https://github.com/containerd/containerd.git && \ git clone https://github.com/containerd/containerd.git && \

10
tools/alpine/versions.aarch64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:ae5646c043bb48cee3fa428714ee27dda2f57812-arm64 # linuxkit/alpine:941b953167b50becb3b34992df9cd9791edb1a08-arm64
# automatically generated list of installed packages # automatically generated list of installed packages
abuild-3.0.0_rc2-r8 abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0 alpine-baselayout-3.0.4-r0
@ -114,7 +114,7 @@ libcap-2.25-r1
libcap-ng-0.7.8-r0 libcap-ng-0.7.8-r0
libcap-ng-dev-0.7.8-r0 libcap-ng-dev-0.7.8-r0
libcom_err-1.43.4-r0 libcom_err-1.43.4-r0
libcrypto1.0-1.0.2k-r0 libcrypto1.0-1.0.2m-r0
libcurl-7.56.1-r0 libcurl-7.56.1-r0
libdrm-2.4.80-r0 libdrm-2.4.80-r0
libedit-20170329.3.1-r2 libedit-20170329.3.1-r2
@ -159,7 +159,7 @@ libseccomp-2.3.2-r0
libseccomp-dev-2.3.2-r0 libseccomp-dev-2.3.2-r0
libsmartcols-2.28.2-r2 libsmartcols-2.28.2-r2
libssh2-1.8.0-r1 libssh2-1.8.0-r1
libssl1.0-1.0.2k-r0 libssl1.0-1.0.2m-r0
libstdc++-6.3.0-r4 libstdc++-6.3.0-r4
libtasn1-4.10-r2 libtasn1-4.10-r2
libtirpc-1.0.1-r1 libtirpc-1.0.1-r1
@ -202,8 +202,8 @@ openntpd-6.0_p1-r3
openrc-0.24.1-r2 openrc-0.24.1-r2
openssh-keygen-7.5_p1-r1 openssh-keygen-7.5_p1-r1
openssh-server-7.5_p1-r1 openssh-server-7.5_p1-r1
openssl-1.0.2k-r0 openssl-1.0.2m-r0
openssl-dev-1.0.2k-r0 openssl-dev-1.0.2m-r0
opus-1.1.4-r0 opus-1.1.4-r0
p11-kit-0.23.2-r1 p11-kit-0.23.2-r1
patch-2.7.5-r1 patch-2.7.5-r1

10
tools/alpine/versions.x86_64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:0fb5b5e7952d22eeae57607493168e679a4a0c0a-amd64 # linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28-amd64
# automatically generated list of installed packages # automatically generated list of installed packages
abuild-3.0.0_rc2-r8 abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0 alpine-baselayout-3.0.4-r0
@ -117,7 +117,7 @@ libcap-2.25-r1
libcap-ng-0.7.8-r0 libcap-ng-0.7.8-r0
libcap-ng-dev-0.7.8-r0 libcap-ng-dev-0.7.8-r0
libcom_err-1.43.4-r0 libcom_err-1.43.4-r0
libcrypto1.0-1.0.2k-r0 libcrypto1.0-1.0.2m-r0
libcurl-7.56.1-r0 libcurl-7.56.1-r0
libdrm-2.4.80-r0 libdrm-2.4.80-r0
libedit-20170329.3.1-r2 libedit-20170329.3.1-r2
@ -164,7 +164,7 @@ libseccomp-2.3.2-r0
libseccomp-dev-2.3.2-r0 libseccomp-dev-2.3.2-r0
libsmartcols-2.28.2-r2 libsmartcols-2.28.2-r2
libssh2-1.8.0-r1 libssh2-1.8.0-r1
libssl1.0-1.0.2k-r0 libssl1.0-1.0.2m-r0
libstdc++-6.3.0-r4 libstdc++-6.3.0-r4
libtasn1-4.10-r2 libtasn1-4.10-r2
libtirpc-1.0.1-r1 libtirpc-1.0.1-r1
@ -209,8 +209,8 @@ openntpd-6.0_p1-r3
openrc-0.24.1-r2 openrc-0.24.1-r2
openssh-keygen-7.5_p1-r1 openssh-keygen-7.5_p1-r1
openssh-server-7.5_p1-r1 openssh-server-7.5_p1-r1
openssl-1.0.2k-r0 openssl-1.0.2m-r0
openssl-dev-1.0.2k-r0 openssl-dev-1.0.2m-r0
opus-1.1.4-r0 opus-1.1.4-r0
ovmf-0.0.20161115-r1 ovmf-0.0.20161115-r1
p11-kit-0.23.2-r1 p11-kit-0.23.2-r1