Merge pull request #2258 from ijc/containerd-v1.0.0-alpha1

Containerd v1.0.0 alpha1
This commit is contained in:
Justin Cormack
2017-07-20 15:07:24 +01:00
committed by GitHub
45 changed files with 84 additions and 79 deletions

View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@@ -27,7 +27,7 @@ onboot:
- /var/lib:/var/lib
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd
@@ -37,7 +37,7 @@ services:
- name: ntpd
image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
- name: docker
image: docker:17.06.0-ce-dind
capabilities:

View File

@@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:d049e7b2074da5cd699a27defb47eb101142455d
- linuxkit/runc:d5cbeb95bdafedb82ad2cf11cff1a5da7fcae630
- linuxkit/containerd:b6ffbb669248e3369081a6c4427026aa968a2385
- linuxkit/containerd:e33e0534d6fca88e1eb86897a1ea410b4a5d722e
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl
@@ -27,7 +27,7 @@ onboot:
- /var/lib:/var/lib
services:
- name: getty
image: linuxkit/getty:0a2955f3d7a10a0e71972791c3ba6400118f327e
image: linuxkit/getty:9c32352b2a7b2f233de8741396afeb26b58f9a05
env:
- INSECURE=true
- name: rngd
@@ -37,7 +37,7 @@ services:
- name: ntpd
image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90
- name: sshd
image: linuxkit/sshd:89b2e91d7d1bf2f40220be0e3ed586e74746cceb
image: linuxkit/sshd:a00846032891f77f4f78b8a197e94e13a476a3ee
- name: docker
image: docker:17.06.0-ce-dind
capabilities: