github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2786 from ijc/containerd-v1.0.0-rc.0

Browse Source 
Bump to containerd-v1.0.0-rc.0
This commit is contained in:
Ian Campbell 2017-12-01 15:08:37 +00:00 committed by GitHub
commit b0fbb5e4fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 123 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,9 @@ kernel:
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: 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:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- 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

4
examples/aws.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/azure.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/cadvisor.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/docker.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/gcp.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/getty.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/minimal.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

4
examples/node_exporter.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0" cmdline: "console=tty0 console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
services: services:
- name: getty - name: getty
image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa

4
examples/openstack.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/packet.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS1 console=ttyAMA0" cmdline: "console=ttyS1 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: rngd1 - name: rngd1

4
examples/redis-os.yml
View File

@ -4,9 +4,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

4
examples/sshd.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/swap.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/tpm.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.38 image: linuxkit/kernel:4.9.38
cmdline: "console=tty0 console=ttyS0" cmdline: "console=tty0 console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/vmware.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0" cmdline: "console=tty0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/vpnkit-forwarder.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

4
examples/vsudd.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
onboot: onboot:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e image: linuxkit/dhcpcd:48831507404049660b960e4055f544917d90378e

4
examples/vultr.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
examples/wireguard.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

4
linuxkit.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" cmdline: "console=tty0 console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- 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:7d79062909882186e881aad263668d66e6df2a28 as alpine FROM linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355 as alpine
RUN apk add tzdata RUN apk add tzdata
WORKDIR $GOPATH/src/github.com/containerd/containerd WORKDIR $GOPATH/src/github.com/containerd/containerd

4
pkg/init/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:7d79062909882186e881aad263668d66e6df2a28 AS build FROM linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355 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 ./
@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s
RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
RUN go-compile.sh /go/src/cmd/service RUN go-compile.sh /go/src/cmd/service
FROM linuxkit/alpine:07f7d136e427dc68154cd5edbb2b9576f9ac5213 AS mirror FROM linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355 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/
RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl

19
pkg/init/cmd/service/start.go
View File

@ -10,6 +10,7 @@ import (
"path/filepath" "path/filepath"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@ -55,21 +56,21 @@ func startCmd(args []string) {
log.Debugf("Started %s pid %d", id, pid) log.Debugf("Started %s pid %d", id, pid)
} }
type cio struct { type logio struct {
config containerd.IOConfig config cio.Config
} }
func (c *cio) Config() containerd.IOConfig { func (c *logio) Config() cio.Config {
return c.config return c.config
} }
func (c *cio) Cancel() { func (c *logio) Cancel() {
} }
func (c *cio) Wait() { func (c *logio) Wait() {
} }
func (c *cio) Close() error { func (c *logio) Close() error {
return nil return nil
} }
@ -120,7 +121,7 @@ func start(service, sock, basePath, dumpSpec string) (string, uint32, string, er
return "", 0, "failed to create container", err return "", 0, "failed to create container", err
} }
io := func(id string) (containerd.IO, error) { io := func(id string) (cio.IO, error) {
stdoutFile := filepath.Join("/var/log", service+".out.log") stdoutFile := filepath.Join("/var/log", service+".out.log")
stderrFile := filepath.Join("/var/log", service+".err.log") stderrFile := filepath.Join("/var/log", service+".err.log")
// We just need this to exist. If we cannot write to the directory, // We just need this to exist. If we cannot write to the directory,
@ -131,8 +132,8 @@ func start(service, sock, basePath, dumpSpec string) (string, uint32, string, er
if err := ioutil.WriteFile(stderrFile, []byte{}, 0600); err != nil { if err := ioutil.WriteFile(stderrFile, []byte{}, 0600); err != nil {
stderrFile = "/dev/null" stderrFile = "/dev/null"
} }
return &cio{ return &logio{
containerd.IOConfig{ cio.Config{
Stdin: "/dev/null", Stdin: "/dev/null",
Stdout: stdoutFile, Stdout: stdoutFile,
Stderr: stderrFile, Stderr: stderrFile,

4
projects/swarmd/swarmd.yml
View File

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
test/cases/000_build/000_outputs/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: dhcpcd - name: dhcpcd

2
test/cases/010_platforms/000_qemu/000_run_kernel/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

2
test/cases/010_platforms/000_qemu/010_run_iso/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

2
test/cases/010_platforms/000_qemu/020_run_efi/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

2
test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

2
test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

2
test/cases/010_platforms/000_qemu/050_run_aws/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

2
test/cases/010_platforms/000_qemu/100_container/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

2
test/cases/010_platforms/010_hyperkit/000_run_kernel/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

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

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
services: services:
- name: acpid - name: acpid
image: linuxkit/acpid:168f871c7211c9d5e96002d53cb497b26e2d622b image: linuxkit/acpid:168f871c7211c9d5e96002d53cb497b26e2d622b

2
test/cases/020_kernel/000_config_4.4.x/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.4.102 image: linuxkit/kernel:4.4.102
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: check-kernel-config - name: check-kernel-config

2
test/cases/020_kernel/001_config_4.9.x/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: check-kernel-config - name: check-kernel-config

2
test/cases/020_kernel/005_config_4.13.x/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.13.16 image: linuxkit/kernel:4.13.16
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: check-kernel-config - name: check-kernel-config

2
test/cases/020_kernel/006_config_4.14.x/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.14.2 image: linuxkit/kernel:4.14.2
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: check-kernel-config - name: check-kernel-config

2
test/cases/020_kernel/010_kmod_4.4.x/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.4.102 image: linuxkit/kernel:4.4.102
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: check - name: check

2
test/cases/020_kernel/011_kmod_4.9.x/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: check - name: check

2
test/cases/020_kernel/015_kmod_4.13.x/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.13.16 image: linuxkit/kernel:4.13.16
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: check - name: check

2
test/cases/020_kernel/016_kmod_4.14.x/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.14.2 image: linuxkit/kernel:4.14.2
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: check - name: check

2
test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.4.102 image: linuxkit/kernel:4.4.102
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
trust: trust:
org: org:

2
test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
trust: trust:
org: org:

2
test/cases/020_kernel/110_namespace/005_kernel-4.13.x/common.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.13.16 image: linuxkit/kernel:4.13.16
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
trust: trust:
org: org:

2
test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.14.2 image: linuxkit/kernel:4.14.2
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
trust: trust:
org: org:

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

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: sysctl - name: sysctl

2
test/cases/030_security/010_ports/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: test - name: test

2
test/cases/040_packages/002_binfmt/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: binfmt - name: binfmt

2
test/cases/040_packages/003_ca-certificates/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:

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

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- 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:a2384bb503c16b791986710a2636c4640bfdb31e image: linuxkit/test-containerd:22e315c1b787c6e3b55a8ef9184b571bad897925
- name: poweroff - name: poweroff
image: linuxkit/poweroff:280bd01daa8776fbe1f4d912977f1886b8374834 image: linuxkit/poweroff:280bd01daa8776fbe1f4d912977f1886b8374834
trust: trust:

2
test/cases/040_packages/004_dhcpcd/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: dhcpcd - name: dhcpcd

2
test/cases/040_packages/005_extend/000_ext4/test-create.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: format - name: format

2
test/cases/040_packages/005_extend/000_ext4/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: extend - name: extend

2
test/cases/040_packages/005_extend/001_btrfs/test-create.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: modprobe - name: modprobe

2
test/cases/040_packages/005_extend/001_btrfs/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: modprobe - name: modprobe

2
test/cases/040_packages/005_extend/002_xfs/test-create.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: format - name: format

2
test/cases/040_packages/005_extend/002_xfs/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: extend - name: extend

2
test/cases/040_packages/006_format_mount/000_auto/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: format - name: format

2
test/cases/040_packages/006_format_mount/001_by_label/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: format - name: format

2
test/cases/040_packages/006_format_mount/002_by_name/test.yml.in
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.38 image: linuxkit/kernel:4.9.38
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: format - name: format

2
test/cases/040_packages/006_format_mount/003_btrfs/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: modprobe - name: modprobe

2
test/cases/040_packages/006_format_mount/004_xfs/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: format - name: format

2
test/cases/040_packages/006_format_mount/005_by_device_force/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.51 image: linuxkit/kernel:4.9.51
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: format - name: format

2
test/cases/040_packages/006_format_mount/010_multiple/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: format - name: format

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

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.x image: linuxkit/kernel:4.9.x
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: dhcpcd - name: dhcpcd

2
test/cases/040_packages/013_mkimage/mkimage.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: mkimage - name: mkimage

2
test/cases/040_packages/013_mkimage/run.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: poweroff - name: poweroff

2
test/cases/040_packages/019_sysctl/test.yml
View File

@ -2,7 +2,7 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0 page_poison=1" cmdline: "console=ttyS0 page_poison=1"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: sysctl - name: sysctl

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

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
- linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26 - linuxkit/ca-certificates:af4880e78edc28743f7c5e262678c67c6add4c26
onboot: onboot:
- name: dhcpcd - name: dhcpcd

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

@ -2,9 +2,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
onboot: onboot:
- name: ltp - name: ltp
image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd image: linuxkit/test-ltp:0967388fb338867dddd3c1a72470a1a7cec5a0dd

4
test/hack/test.yml
View File

@ -4,9 +4,9 @@ kernel:
image: linuxkit/kernel:4.9.65 image: linuxkit/kernel:4.9.65
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
- linuxkit/containerd:bfb61cc1d26c39cd4b2bc08f7a9963fefa0ef3bf - linuxkit/containerd:737e4b004e28510d2dd504942b80fa5ffa409315
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:7d79062909882186e881aad263668d66e6df2a28 AS mirror FROM linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355 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
test/pkg/ns/template.yml
View File

@ -3,7 +3,7 @@ kernel:
image: linuxkit/kernel:4.9.38 image: linuxkit/kernel:4.9.38
cmdline: "console=ttyS0" cmdline: "console=ttyS0"
init: init:
- linuxkit/init:42a92119e1ca10380e0d33e26c0cbcf85b9b3558 - linuxkit/init:7357177a8be310e40fef7424305a72c198e857c4
- linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d - linuxkit/runc:1b0741d07949c0acc444cd6a04ee7f833443579d
onboot: onboot:
- name: test-ns - name: test-ns

4
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.3 ENV CONTAINERD_COMMIT=v1.0.0-rc.0
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 && \
@ -54,7 +54,7 @@ RUN mkdir -p $GOPATH/src/github.com/containerd && \
git checkout $CONTAINERD_COMMIT git checkout $CONTAINERD_COMMIT
RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make
RUN cd $GOPATH/src/github.com/containerd/containerd && \ RUN cd $GOPATH/src/github.com/containerd/containerd && \
make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILD_TAGS="static_build"
FROM alpine:3.6 FROM alpine:3.6

6
tools/alpine/versions.aarch64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:4e4f7a9be7a10f1378542c6cb739c43806f02fde-arm64 # linuxkit/alpine:31ac51dd8ec0510a1cf585b425782569f67bfa1a-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
@ -23,7 +23,7 @@ btrfs-progs-4.10.2-r0
btrfs-progs-dev-4.10.2-r0 btrfs-progs-dev-4.10.2-r0
btrfs-progs-libs-4.10.2-r0 btrfs-progs-libs-4.10.2-r0
build-base-0.5-r0 build-base-0.5-r0
busybox-1.26.2-r7 busybox-1.26.2-r9
busybox-initscripts-3.1-r1 busybox-initscripts-3.1-r1
bzip2-1.0.6-r5 bzip2-1.0.6-r5
ca-certificates-20161130-r2 ca-certificates-20161130-r2
@ -259,7 +259,7 @@ util-linux-dev-2.28.2-r2
vde2-libs-2.3.2-r7 vde2-libs-2.3.2-r7
vim-8.0.0595-r0 vim-8.0.0595-r0
wayland-1.13.0-r0 wayland-1.13.0-r0
wireguard-tools-0.0.20171111-r0 wireguard-tools-0.0.20171127-r0
wireless-tools-30_pre9-r0 wireless-tools-30_pre9-r0
wpa_supplicant-2.6-r4 wpa_supplicant-2.6-r4
xfsprogs-4.5.0-r0 xfsprogs-4.5.0-r0

6
tools/alpine/versions.x86_64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb-amd64 # linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355-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
@ -23,7 +23,7 @@ btrfs-progs-4.10.2-r0
btrfs-progs-dev-4.10.2-r0 btrfs-progs-dev-4.10.2-r0
btrfs-progs-libs-4.10.2-r0 btrfs-progs-libs-4.10.2-r0
build-base-0.5-r0 build-base-0.5-r0
busybox-1.26.2-r7 busybox-1.26.2-r9
busybox-initscripts-3.1-r1 busybox-initscripts-3.1-r1
bzip2-1.0.6-r5 bzip2-1.0.6-r5
ca-certificates-20161130-r2 ca-certificates-20161130-r2
@ -267,7 +267,7 @@ util-linux-dev-2.28.2-r2
vde2-libs-2.3.2-r7 vde2-libs-2.3.2-r7
vim-8.0.0595-r0 vim-8.0.0595-r0
wayland-1.13.0-r0 wayland-1.13.0-r0
wireguard-tools-0.0.20171111-r0 wireguard-tools-0.0.20171127-r0
wireless-tools-30_pre9-r0 wireless-tools-30_pre9-r0
wpa_supplicant-2.6-r4 wpa_supplicant-2.6-r4
xfsprogs-4.5.0-r0 xfsprogs-4.5.0-r0