From c854d58ca49c5a438261f20645bfbd2efa8d8fde Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Sun, 16 Apr 2017 15:14:48 -0500
Subject: [PATCH] demo: Update etcd

- Add prometheus node monitor
- Make the hyperkit VMs slightly bigger
- Add GCP upload
- Use env vars in infrakit startup script

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 projects/demo/etcd/etcd.yml          | 18 ++++++++++++++++--
 projects/demo/etcd/infrakit.json     |  4 ++--
 projects/demo/etcd/pkg/build-pkg.sh  |  2 +-
 projects/demo/etcd/start-infrakit.sh |  3 ++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml
index e54757ce5..5334cc5eb 100644
--- a/projects/demo/etcd/etcd.yml
+++ b/projects/demo/etcd/etcd.yml
@@ -67,8 +67,18 @@ services:
       - CAP_SETUID
       - CAP_SETGID
     net: host
+  - name: node_exporter
+    image: "linuxkit/node_exporter:0c7c1588e4cbce9cc946c1a84d3902b38b4b7ada"
+    capabilities:
+     - all
+    net: host
+    pid: host
+    binds:
+     - /proc:/host/proc
+     - /sys:/host/sys
+     - /:/rootfs
   - name: etcd
-    image: "linuxkit/etcd"
+    image: "moby/etcd"
     capabilities:
      - CAP_CHOWN
      - CAP_SETUID
@@ -83,4 +93,8 @@ services:
 
 outputs:
   - format: kernel+initrd
-  - format: gcp-img
+  - format: gcp
+    project: docker4x
+    bucket: rolf
+    family: moby-demo
+    replace: true
diff --git a/projects/demo/etcd/infrakit.json b/projects/demo/etcd/infrakit.json
index 263d070e3..9be5cac19 100644
--- a/projects/demo/etcd/infrakit.json
+++ b/projects/demo/etcd/infrakit.json
@@ -14,9 +14,9 @@
             "Plugin": "instance-hyperkit",
             "Properties": {
                 "kernel+initrd": "etcd",
-                "Disk" : 1024,
+                "Disk" : 2048,
                 "CPUs" : 1,
-                "Memory" : 512
+                "Memory" : 1024
             }
         },
         "Flavor": {
diff --git a/projects/demo/etcd/pkg/build-pkg.sh b/projects/demo/etcd/pkg/build-pkg.sh
index 88f9c56b1..30e8f92a2 100755
--- a/projects/demo/etcd/pkg/build-pkg.sh
+++ b/projects/demo/etcd/pkg/build-pkg.sh
@@ -1,4 +1,4 @@
 #! /bin/sh
-docker build -t linuxkit/etcd .
+docker build -t moby/etcd .
 
 docker build -t etcd.local -f Dockerfile.local .
diff --git a/projects/demo/etcd/start-infrakit.sh b/projects/demo/etcd/start-infrakit.sh
index d0c37e2ae..ac368dfa3 100755
--- a/projects/demo/etcd/start-infrakit.sh
+++ b/projects/demo/etcd/start-infrakit.sh
@@ -10,7 +10,8 @@ mkdir -p $INFRAKIT_HOME/cli
 
 infrakit-flavor-vanilla &
 infrakit-instance-hyperkit &
-infrakit-instance-gcp --project docker4x --zone europe-west1-d &
+infrakit-instance-gcp --project $CLOUDSDK_CORE_PROJECT --zone $CLOUDSDK_COMPUTE_ZONE &
+
 
 # start the group plugin in the foreground. If it exits, it will take
 # the others down as well.