From cbbd9b44eec166c77ab8a24792ad6de19e2e994d Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 15 Apr 2017 17:13:32 -0500 Subject: [PATCH 1/3] demo: add a env file for setting up the environment for the demo Signed-off-by: Rolf Neugebauer --- projects/demo/env.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 projects/demo/env.sh diff --git a/projects/demo/env.sh b/projects/demo/env.sh new file mode 100644 index 000000000..1e636b61d --- /dev/null +++ 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 From 8eb39e6b9e8e33f7ddb15644c7241e0105eb42bf Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 15 Apr 2017 17:15:11 -0500 Subject: [PATCH 2/3] demo: Rename intro into my-nginx Signed-off-by: Rolf Neugebauer --- projects/demo/{intro/intro.yml => my-nginx/my-nginx.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename projects/demo/{intro/intro.yml => my-nginx/my-nginx.yml} (100%) diff --git a/projects/demo/intro/intro.yml b/projects/demo/my-nginx/my-nginx.yml similarity index 100% rename from projects/demo/intro/intro.yml rename to projects/demo/my-nginx/my-nginx.yml From 5c1340b13dd994abf511645efbbb9f3961d817b0 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 15 Apr 2017 17:51:15 -0500 Subject: [PATCH 3/3] demo: Remove sysctl container from nginx sample Signed-off-by: Rolf Neugebauer --- projects/demo/my-nginx/my-nginx.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/projects/demo/my-nginx/my-nginx.yml b/projects/demo/my-nginx/my-nginx.yml index 92b41edba..37704a26b 100644 --- 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"