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

Merge pull request #1637 from rneugeba/demo-up

Browse Source 
demo: Update to use containerd
This commit is contained in:
Rolf Neugebauer 2017-04-15 07:22:48 -05:00 committed by GitHub
commit a05d81eed5
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
projects/demo/etcd/etcd.yml
View File

@ -2,9 +2,9 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
- linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl
@ -83,7 +83,4 @@ services:
outputs:
- format: kernel+initrd
- format: gcp
project: docker4x
bucket: rolf
replace: true
- format: gcp-img

2
projects/demo/etcd/infrakit-gcp.json
View File

@ -13,7 +13,7 @@
"Instance": {
"Plugin": "instance-gcp",
"Properties": {
"NamePrefix": "etcdtest",
"NamePrefix": "etcd-demo",
"Description": "ETCD test cluster",
"Network": "rneugeba-demo",
"Connect" : true,

4
projects/demo/intro/intro.yml
View File

@ -2,9 +2,9 @@ kernel:
image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1"
init:
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
- linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
onboot:
- name: sysctl
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"