From 702ad5d9d9646826a158774c9bd2cde259723856 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 19 May 2017 16:05:17 +0100 Subject: [PATCH] Update git hashes for sysctl And remove all the config options as they are now in the label. Signed-off-by: Justin Cormack --- examples/docker.yml | 8 +------- examples/gcp.yml | 8 +------- examples/packet.yml | 7 +------ examples/sshd.yml | 7 +------ examples/swap.yml | 8 +------- examples/vmware.yml | 8 +------- linuxkit.yml | 8 +------- projects/etcd/etcd.yml | 8 +------- projects/etcd/prom-us-central1-f.yml | 8 +------- projects/ima-namespace/ima-namespace.yml | 8 +------- projects/kubernetes/kube-master.yml | 8 +------- projects/kubernetes/kube-node.yml | 8 +------- projects/logging/examples/logging.yml | 8 +------- projects/miragesdk/examples/mirage-dhcp.yml | 8 +------- projects/okernel/examples/okernel_simple.yaml | 7 +------ projects/swarmd/swarmd.yml | 8 +------- .../030_security/000_docker-bench/test-docker-bench.yml | 8 +------- test/cases/040_packages/000_sysctl/test-sysctl.yml | 8 +------- 18 files changed, 18 insertions(+), 123 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index cf8b9244e..541e93f97 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: sysfs image: linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c - name: binfmt diff --git a/examples/gcp.yml b/examples/gcp.yml index 97c8109c8..9ad411d8b 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: dhcpcd image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0" binds: diff --git a/examples/packet.yml b/examples/packet.yml index 66c6f81a7..99b0bbd3e 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -8,12 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" services: - name: rngd image: "linuxkit/rngd:c97ef16be340884a985d8b025983505a9bcc51f0" diff --git a/examples/sshd.yml b/examples/sshd.yml index b641eb083..b0c16588a 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -8,12 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" services: - name: rngd image: "linuxkit/rngd:c97ef16be340884a985d8b025983505a9bcc51f0" diff --git a/examples/swap.yml b/examples/swap.yml index 710bd03ee..758ff305a 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: binfmt image: "linuxkit/binfmt:548f7f044f5411a8938913527c5ce55d9876bb07" binds: diff --git a/examples/vmware.yml b/examples/vmware.yml index 652c9c095..62eedfa63 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" services: - name: rngd image: "linuxkit/rngd:c97ef16be340884a985d8b025983505a9bcc51f0" diff --git a/linuxkit.yml b/linuxkit.yml index 244c12223..86db4873b 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: binfmt image: "linuxkit/binfmt:548f7f044f5411a8938913527c5ce55d9876bb07" binds: diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 51ca8b8dd..2ad45e794 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: format image: "linuxkit/format:d78093e943f9c88386e30c00353f9476d34fb551" binds: diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml index bf1334769..7df7b10f5 100644 --- a/projects/etcd/prom-us-central1-f.yml +++ b/projects/etcd/prom-us-central1-f.yml @@ -8,13 +8,7 @@ init: - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: dhcpcd image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0" binds: diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index a2f1316b9..30e8f9d52 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -9,13 +9,7 @@ init: - linuxkit/ima-utils:fe119c7dac08884f4144cd106dc279ddd8b37517 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: binfmt image: "linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c" binds: diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 6bc7d2808..2aff03805 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: sysfs image: linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c - name: binfmt diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 116ad1cf6..72a9752fe 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: sysfs image: linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c - name: binfmt diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 1a7627ba9..5a00b7ce7 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -9,13 +9,7 @@ init: - linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: binfmt image: "linuxkit/binfmt:548f7f044f5411a8938913527c5ce55d9876bb07" binds: diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 8b629ebc4..f21ae92d1 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -8,13 +8,7 @@ init: - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: sysctl - image: linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: binfmt image: linuxkit/binfmt:548f7f044f5411a8938913527c5ce55d9876bb07 binds: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 29e11fb66..499d69aa7 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -8,12 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" services: - name: rngd image: "linuxkit/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9" diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 303055c71..d4af90dfb 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: dhcpcd image: "linuxkit/dhcpcd:cb96c09a33c166eca6530f166f0f79927c3e83b0" binds: diff --git a/test/cases/030_security/000_docker-bench/test-docker-bench.yml b/test/cases/030_security/000_docker-bench/test-docker-bench.yml index 91f533a4b..996b692d2 100644 --- a/test/cases/030_security/000_docker-bench/test-docker-bench.yml +++ b/test/cases/030_security/000_docker-bench/test-docker-bench.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: sysfs image: "linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c" - name: binfmt diff --git a/test/cases/040_packages/000_sysctl/test-sysctl.yml b/test/cases/040_packages/000_sysctl/test-sysctl.yml index 10d20fc44..2d098e446 100644 --- a/test/cases/040_packages/000_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/000_sysctl/test-sysctl.yml @@ -8,13 +8,7 @@ init: - linuxkit/ca-certificates:4e9a83e890e6477dcd25029fc4f1ced61d0642f4 onboot: - name: sysctl - image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" - net: host - pid: host - ipc: host - capabilities: - - CAP_SYS_ADMIN - readonly: true + image: "linuxkit/sysctl:13a37b8d38fbec34d8c7d3bd4dadb57c9f92c94c" - name: test image: "linuxkit/test-sysctl:37315a58ec0c18a28be7e2770feb3bf38384492d" net: host