From b0629176abb25be15276db02bb70da7e85bb10d7 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 12 Apr 2017 11:29:05 +0100 Subject: [PATCH] examples: Don't use a file section if you don't need it Exception is ./moby.yaml where it serves as an example. Signed-off-by: Rolf Neugebauer --- examples/docker.yml | 3 +++ examples/gcp.yml | 3 --- examples/vmware.yml | 3 --- projects/landlock/landlock.yml | 3 --- projects/selinux/selinux.yml | 3 --- projects/swarmd/swarmd.yml | 3 --- projects/wireguard/examples/wireguard.yml | 3 --- 7 files changed, 3 insertions(+), 18 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index 4371e90b3..e0dc654b3 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -76,6 +76,9 @@ services: binds: - /var/lib/docker:/var/lib/docker - /lib/modules:/lib/modules +files: + - path: etc/docker/daemon.json + contents: '{"debug": true}' trust: image: - mobylinux/kernel diff --git a/examples/gcp.yml b/examples/gcp.yml index 0571f8371..628e282dd 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -64,9 +64,6 @@ services: trust: image: - mobylinux/kernel -files: - - path: etc/docker/daemon.json - contents: '{"debug": true}' outputs: - format: kernel+initrd - format: gcp diff --git a/examples/vmware.yml b/examples/vmware.yml index 4d4978f81..295cb9e1f 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -45,8 +45,5 @@ services: trust: image: - mobylinux/kernel -files: - - path: etc/docker/daemon.json - contents: '{"debug": true}' outputs: - format: vmdk diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index d7921a272..728b3c38e 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -22,9 +22,6 @@ services: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true -files: - - path: etc/docker/daemon.json - contents: '{"debug": true}' outputs: - format: kernel+initrd - format: iso-bios diff --git a/projects/selinux/selinux.yml b/projects/selinux/selinux.yml index 12cdff883..86f6dbe1f 100644 --- a/projects/selinux/selinux.yml +++ b/projects/selinux/selinux.yml @@ -19,9 +19,6 @@ services: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true -files: - - path: etc/docker/daemon.json - contents: '{"debug": true}' outputs: - format: kernel+initrd - format: iso-bios diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 8b6cd261e..a3013a8f6 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -53,9 +53,6 @@ services: - /run/containerd/containerd.sock:/run/containerd/containerd.sock - /var/lib/containerd:/var/lib/containerd - /etc/resolv.conf:/etc/resolv.conf -files: - - path: etc/docker/daemon.json - contents: '{"debug": true}' outputs: - format: kernel+initrd - format: iso-bios diff --git a/projects/wireguard/examples/wireguard.yml b/projects/wireguard/examples/wireguard.yml index 9c02540b3..0d0c408a4 100644 --- a/projects/wireguard/examples/wireguard.yml +++ b/projects/wireguard/examples/wireguard.yml @@ -19,9 +19,6 @@ services: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true -files: - - path: etc/docker/daemon.json - contents: '{"debug": true}' outputs: - format: kernel+initrd - format: iso-bios