demo: Update etcd demo to use linuxkit

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-04-14 10:37:44 -05:00
parent 8462e34d6e
commit e374cb3543
2 changed files with 13 additions and 14 deletions

View File

@ -1,4 +1,4 @@
#! /bin/sh #! /bin/sh
docker build -t mobylinux/etcd . docker build -t linuxkit/etcd .
docker build -t etcd.local -f Dockerfile.local . docker build -t etcd.local -f Dockerfile.local .

View File

@ -1,14 +1,14 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "linuxkit/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: init:
- mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
- mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
- mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
- mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot: onboot:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
net: host net: host
pid: host pid: host
ipc: host ipc: host
@ -16,14 +16,14 @@ onboot:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
readonly: true readonly: true
- name: format - name: format
image: "mobylinux/format:53748000acf515549d398e6ae68545c26c0f3a2e" image: "linuxkit/format:53748000acf515549d398e6ae68545c26c0f3a2e"
binds: binds:
- /dev:/dev - /dev:/dev
capabilities: capabilities:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
- CAP_MKNOD - CAP_MKNOD
- name: mount - name: mount
image: "mobylinux/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a" image: "linuxkit/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a"
binds: binds:
- /dev:/dev - /dev:/dev
- /var:/var:rshared,rbind - /var:/var:rshared,rbind
@ -32,7 +32,7 @@ onboot:
rootfsPropagation: shared rootfsPropagation: shared
command: ["/mount.sh", "/var/lib/etcd"] command: ["/mount.sh", "/var/lib/etcd"]
- name: dhcpcd - name: dhcpcd
image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
binds: binds:
- /var:/var - /var:/var
- /tmp/etc:/etc - /tmp/etc:/etc
@ -48,19 +48,18 @@ onboot:
- /dev:/dev - /dev:/dev
- /var:/var - /var:/var
- /tmp/etc/resolv.conf:/etc/resolv.conf - /tmp/etc/resolv.conf:/etc/resolv.conf
readonly: true
net: host net: host
capabilities: capabilities:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
services: services:
- name: rngd - name: rngd
image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9" image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314"
capabilities: capabilities:
- CAP_SYS_ADMIN - CAP_SYS_ADMIN
oomScoreAdj: -800 oomScoreAdj: -800
readonly: true readonly: true
- name: ntpd - name: ntpd
image: "mobylinux/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af" image: "linuxkit/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af"
capabilities: capabilities:
- CAP_SYS_TIME - CAP_SYS_TIME
- CAP_SYS_NICE - CAP_SYS_NICE
@ -69,7 +68,7 @@ services:
- CAP_SETGID - CAP_SETGID
net: host net: host
- name: etcd - name: etcd
image: "mobylinux/etcd" image: "linuxkit/etcd"
capabilities: capabilities:
- CAP_CHOWN - CAP_CHOWN
- CAP_SETUID - CAP_SETUID