From e374cb354341483f16aed47d3d119b91d3e2748a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 14 Apr 2017 10:37:44 -0500 Subject: [PATCH] demo: Update etcd demo to use linuxkit Signed-off-by: Rolf Neugebauer --- projects/demo/etcd/build-pkg.sh | 2 +- projects/demo/etcd/etcd.yml | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/projects/demo/etcd/build-pkg.sh b/projects/demo/etcd/build-pkg.sh index a1da2c2f5..88f9c56b1 100755 --- a/projects/demo/etcd/build-pkg.sh +++ b/projects/demo/etcd/build-pkg.sh @@ -1,4 +1,4 @@ #! /bin/sh -docker build -t mobylinux/etcd . +docker build -t linuxkit/etcd . docker build -t etcd.local -f Dockerfile.local . diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml index 3f8831255..e7d24da73 100644 --- a/projects/demo/etcd/etcd.yml +++ b/projects/demo/etcd/etcd.yml @@ -1,14 +1,14 @@ kernel: - image: "mobylinux/kernel:4.9.x" + image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - mobylinux/init:8375addb923b8b88b2209740309c92aa5f2a4f9d - - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 + - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b + - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 + - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b + - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" + image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" net: host pid: host ipc: host @@ -16,14 +16,14 @@ onboot: - CAP_SYS_ADMIN readonly: true - name: format - image: "mobylinux/format:53748000acf515549d398e6ae68545c26c0f3a2e" + image: "linuxkit/format:53748000acf515549d398e6ae68545c26c0f3a2e" binds: - /dev:/dev capabilities: - CAP_SYS_ADMIN - CAP_MKNOD - name: mount - image: "mobylinux/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a" + image: "linuxkit/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a" binds: - /dev:/dev - /var:/var:rshared,rbind @@ -32,7 +32,7 @@ onboot: rootfsPropagation: shared command: ["/mount.sh", "/var/lib/etcd"] - name: dhcpcd - image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" + image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" binds: - /var:/var - /tmp/etc:/etc @@ -48,19 +48,18 @@ onboot: - /dev:/dev - /var:/var - /tmp/etc/resolv.conf:/etc/resolv.conf - readonly: true net: host capabilities: - CAP_SYS_ADMIN services: - name: rngd - image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9" + image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314" capabilities: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true - name: ntpd - image: "mobylinux/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af" + image: "linuxkit/openntpd:a570316d7fc49ca1daa29bd945499f4963d227af" capabilities: - CAP_SYS_TIME - CAP_SYS_NICE @@ -69,7 +68,7 @@ services: - CAP_SETGID net: host - name: etcd - image: "mobylinux/etcd" + image: "linuxkit/etcd" capabilities: - CAP_CHOWN - CAP_SETUID