From a3d20abdb60b7f1691c7ad36c2f77d95e001a3aa Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Sat, 8 Apr 2017 00:20:34 +0100
Subject: [PATCH] demo: Add a disk to the etcd image

etcd works better with a persistent storage. So configure a
disk and add the formatting container to the image.

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

diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml
index 206ff1a8f..8e4810d22 100644
--- a/projects/demo/etcd/etcd.yml
+++ b/projects/demo/etcd/etcd.yml
@@ -14,6 +14,13 @@ onboot:
     capabilities:
      - CAP_SYS_ADMIN
     readonly: true
+  - name: format
+    image: "mobylinux/format:53748000acf515549d398e6ae68545c26c0f3a2e"
+    binds:
+     - /dev:/dev
+    capabilities:
+     - CAP_SYS_ADMIN
+     - CAP_MKNOD
 services:
   - name: rngd
     image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92"
@@ -35,12 +42,15 @@ services:
   - name: etcd
     image: "mobylinux/etcd"
     capabilities:
-     - CAP_NET_BIND_SERVICE
      - CAP_CHOWN
      - CAP_SETUID
      - CAP_SETGID
      - CAP_DAC_OVERRIDE
+     - CAP_SYS_ADMIN
+     - CAP_MKNOD
     net: host
+    binds:
+     - /dev:/dev
 outputs:
   - format: kernel+initrd
 #  - format: gcp
diff --git a/projects/demo/etcd/infrakit.json b/projects/demo/etcd/infrakit.json
index 412333065..0d7cef887 100644
--- a/projects/demo/etcd/infrakit.json
+++ b/projects/demo/etcd/infrakit.json
@@ -14,7 +14,7 @@
             "Plugin": "instance-hyperkit",
             "Properties": {
                 "Moby": "etcd",
-                "Disk" : 0,
+                "Disk" : 1024,
                 "CPUs" : 1,
                 "Memory" : 1024
             }