Merge pull request #1641 from rneugeba/demo4

Minor tweaks to the demo
2025-07-21 10:09:07 +00:00 · 2017-04-15 18:51:57 -05:00 · 2017-04-15 18:51:57 -05:00 · ab78f1a48c
commit ab78f1a48c
parent a8bddd8415 5c1340b13d
2 changed files with 5 additions and 9 deletions
--- a/projects/demo/env.sh
+++ b/projects/demo/env.sh
@ -0,0 +1,5 @@
+export CLOUDSDK_CORE_PROJECT=docker4x
+export CLOUDSDK_COMPUTE_ZONE=us-central1-f
+export CLOUDSDK_COMPUTE_MACHINE=n1-standard-2
+
+PATH=$PATH:~/src/docker/linuxkit/bin
--- a/projects/demo/my-nginx/my-nginx.yml
+++ b/projects/demo/my-nginx/my-nginx.yml
@ -5,15 +5,6 @@ init:
  - linuxkit/init:42fe8cb1508b3afed39eb89821906e3cc7a70551
  - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
  - linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
-onboot:
-  - name: sysctl
-    image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
-    net: host
-    pid: host
-    ipc: host
-    capabilities:
-     - CAP_SYS_ADMIN
-    readonly: true
 services:
  - name: dhcpcd
    image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"