From 38863774e6173bc9abbe80588c799458f6029e69 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Fri, 14 Apr 2017 19:19:51 -0500
Subject: [PATCH] demo: Update to use containerd

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 projects/demo/etcd/etcd.yml          | 9 +++------
 projects/demo/etcd/infrakit-gcp.json | 2 +-
 projects/demo/intro/intro.yml        | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml
index e7d24da73..e54757ce5 100644
--- a/projects/demo/etcd/etcd.yml
+++ b/projects/demo/etcd/etcd.yml
@@ -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
diff --git a/projects/demo/etcd/infrakit-gcp.json b/projects/demo/etcd/infrakit-gcp.json
index 339347f03..36938edf7 100644
--- a/projects/demo/etcd/infrakit-gcp.json
+++ b/projects/demo/etcd/infrakit-gcp.json
@@ -13,7 +13,7 @@
         "Instance": {
             "Plugin": "instance-gcp",
             "Properties": {
-                "NamePrefix": "etcdtest",
+                "NamePrefix": "etcd-demo",
                 "Description": "ETCD test cluster",
                 "Network": "rneugeba-demo",
                 "Connect" : true,
diff --git a/projects/demo/intro/intro.yml b/projects/demo/intro/intro.yml
index 3c3e1023e..d8bebaafb 100644
--- a/projects/demo/intro/intro.yml
+++ b/projects/demo/intro/intro.yml
@@ -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"