Merge pull request #1495 from rneugeba/demo-up

Update demo project

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:

projects/demo/infrakit/infrakit.json

@@ -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"
-                }
-            }
-        }
-    }
-}

projects/demo/infrakit/nginx-4.10.yml

@@ -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

projects/demo/infrakit/nginx.yml

@@ -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

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