From 1cb8dfc222c75f51dd17f1a5ef496597bc3c1e1c Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 5 Apr 2017 11:07:39 +0100
Subject: [PATCH 1/2] demo: Remove infrakit example.

This is superseded by the etcd infrakit setup now in place.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 projects/demo/infrakit/infrakit.json  | 30 ---------------------------
 projects/demo/infrakit/nginx-4.10.yml | 27 ------------------------
 projects/demo/infrakit/nginx.yml      | 27 ------------------------
 3 files changed, 84 deletions(-)
 delete mode 100644 projects/demo/infrakit/infrakit.json
 delete mode 100644 projects/demo/infrakit/nginx-4.10.yml
 delete mode 100644 projects/demo/infrakit/nginx.yml

diff --git a/projects/demo/infrakit/infrakit.json b/projects/demo/infrakit/infrakit.json
deleted file mode 100644
index 39c3e67dd..000000000
--- a/projects/demo/infrakit/infrakit.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "ID": "cattle",
-    "Properties": {
-        "Allocation": {
-            "Size": 5
-        },
-        "Instance": {
-            "Plugin": "instance-hyperkit",
-            "Properties": {
-                "Moby": "nginx-4.10",
-                "Disk" : 512,
-                "CPUs" : 2,
-                "Memory" : 1024
-            }
-        },
-        "Flavor": {
-            "Plugin": "flavor-vanilla",
-            "Properties": {
-                "Init": [
-                    "test1",
-                    "test2"
-                ],
-                "Tags": {
-                    "tier": "sample",
-                    "project": "infrakit"
-                }
-            }
-        }
-    }
-}
diff --git a/projects/demo/infrakit/nginx-4.10.yml b/projects/demo/infrakit/nginx-4.10.yml
deleted file mode 100644
index 38e85b7bf..000000000
--- a/projects/demo/infrakit/nginx-4.10.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-kernel:
-  image: "mobylinux/kernel:4.10.x"
-  cmdline: "console=ttyS0 console=tty0 page_poison=1"
-init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
-system:
-  - name: sysctl
-    image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
-    net: host
-    pid: host
-    ipc: host
-    capabilities:
-     - CAP_SYS_ADMIN
-    readonly: true
-daemon:
-  - name: nginx
-    image: "nginx:alpine"
-    capabilities:
-     - CAP_NET_BIND_SERVICE
-     - CAP_CHOWN
-     - CAP_SETUID
-     - CAP_SETGID
-     - CAP_DAC_OVERRIDE
-    net: host
-outputs:
-  - format: kernel+initrd
-  - format: iso-bios
-  - format: iso-efi
diff --git a/projects/demo/infrakit/nginx.yml b/projects/demo/infrakit/nginx.yml
deleted file mode 100644
index 83d756594..000000000
--- a/projects/demo/infrakit/nginx.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-kernel:
-  image: "mobylinux/kernel:4.9.x"
-  cmdline: "console=ttyS0 console=tty0 page_poison=1"
-init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
-system:
-  - name: sysctl
-    image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
-    net: host
-    pid: host
-    ipc: host
-    capabilities:
-     - CAP_SYS_ADMIN
-    readonly: true
-daemon:
-  - name: nginx
-    image: "nginx:alpine"
-    capabilities:
-     - CAP_NET_BIND_SERVICE
-     - CAP_CHOWN
-     - CAP_SETUID
-     - CAP_SETGID
-     - CAP_DAC_OVERRIDE
-    net: host
-outputs:
-  - format: kernel+initrd
-  - format: iso-bios
-  - format: iso-efi

From a131ee823b0352f4ec42ad101a3174d78e7ab218 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Wed, 5 Apr 2017 11:08:48 +0100
Subject: [PATCH 2/2] demo: Update YAML files to include DHCP

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 projects/demo/etcd/etcd.yml   | 13 ++++++++++++-
 projects/demo/intro/intro.yml | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml
index 07897d3bf..b7961ebe7 100644
--- a/projects/demo/etcd/etcd.yml
+++ b/projects/demo/etcd/etcd.yml
@@ -1,7 +1,7 @@
 kernel:
   image: "mobylinux/kernel:4.9.x"
   cmdline: "console=ttyS0 console=tty0 page_poison=1"
-init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
+init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802"
 system:
   - name: sysctl
     image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
@@ -18,6 +18,17 @@ daemon:
      - CAP_SYS_ADMIN
     oomScoreAdj: -800
     readonly: true
+  - name: dhcpcd
+    image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2"
+    binds:
+     - /var:/var
+     - /tmp/etc:/etc
+    capabilities:
+     - CAP_NET_ADMIN
+     - CAP_NET_BIND_SERVICE
+     - CAP_NET_RAW
+    net: host
+    oomScoreAdj: -800
   - name: etcd
     image: "mobylinux/etcd"
     capabilities:
diff --git a/projects/demo/intro/intro.yml b/projects/demo/intro/intro.yml
index 83d756594..375df125b 100644
--- a/projects/demo/intro/intro.yml
+++ b/projects/demo/intro/intro.yml
@@ -1,7 +1,7 @@
 kernel:
   image: "mobylinux/kernel:4.9.x"
   cmdline: "console=ttyS0 console=tty0 page_poison=1"
-init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
+init: "mobylinux/init:a27e32a8d6c8865d691fbfb4d0bbb93846cf7802"
 system:
   - name: sysctl
     image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
@@ -12,6 +12,17 @@ system:
      - CAP_SYS_ADMIN
     readonly: true
 daemon:
+  - name: dhcpcd
+    image: "mobylinux/dhcpcd:d01a17d211218f289e2bac601bfe9787d4fabaf2"
+    binds:
+     - /var:/var
+     - /tmp/etc:/etc
+    capabilities:
+     - CAP_NET_ADMIN
+     - CAP_NET_BIND_SERVICE
+     - CAP_NET_RAW
+    net: host
+    oomScoreAdj: -800
   - name: nginx
     image: "nginx:alpine"
     capabilities:
@@ -23,5 +34,3 @@ daemon:
     net: host
 outputs:
   - format: kernel+initrd
-  - format: iso-bios
-  - format: iso-efi