From 842d089a1b7a65100b9702f4d2bb6b816f5ab5a5 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 3 Aug 2017 15:06:49 +0100 Subject: [PATCH] Remove binfmt from most examples It is not in any wa=y a required container, and now that arm64 and other architecture machines are widely available we should start to deprecate it, as it has many issues, eg requires patches to qemu for Go support, will mislabel images etc. Signed-off-by: Justin Cormack --- examples/docker.yml | 2 -- linuxkit.yml | 2 -- projects/compose/compose-dynamic.yml | 2 -- projects/compose/compose-static.yml | 2 -- projects/ima-namespace/ima-namespace.yml | 15 +++------------ projects/kubernetes/kube-master.yml | 2 -- projects/kubernetes/kube-node.yml | 2 -- projects/logging/examples/logging.yml | 15 +++------------ projects/shiftfs/shiftfs.yml | 5 +---- .../000_docker-bench/test-docker-bench.yml | 2 -- 10 files changed, 7 insertions(+), 42 deletions(-) diff --git a/examples/docker.yml b/examples/docker.yml index 0d22bcc1a..e094e826c 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -11,8 +11,6 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: sysfs image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount diff --git a/linuxkit.yml b/linuxkit.yml index 5d263b46d..392f627bb 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -9,8 +9,6 @@ init: onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index c120151d3..9a00dfc69 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -14,8 +14,6 @@ onboot: - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 5a66148d7..f90b2edd5 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -14,8 +14,6 @@ onboot: - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index 4c33287df..19d39e69d 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -10,8 +10,6 @@ init: onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] @@ -30,13 +28,6 @@ files: - path: etc/docker/daemon.json contents: '{"debug": true}' trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd - - linuxkit/ca-certificates - - linuxkit/sysctl - - linuxkit/binfmt - - linuxkit/dhcpcd - - linuxkit/rngd + org: + - linuxkit + - library diff --git a/projects/kubernetes/kube-master.yml b/projects/kubernetes/kube-master.yml index 13078053d..6774325e8 100644 --- a/projects/kubernetes/kube-master.yml +++ b/projects/kubernetes/kube-master.yml @@ -11,8 +11,6 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: sysfs image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] diff --git a/projects/kubernetes/kube-node.yml b/projects/kubernetes/kube-node.yml index 2b1466b17..d3e10b1fa 100644 --- a/projects/kubernetes/kube-node.yml +++ b/projects/kubernetes/kube-node.yml @@ -11,8 +11,6 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: sysfs image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 02423a872..e733cae98 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -10,8 +10,6 @@ init: onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] @@ -30,13 +28,6 @@ files: - path: etc/docker/daemon.json contents: '{"debug": true}' trust: - image: - - linuxkit/kernel - - linuxkit/init - - linuxkit/runc - - linuxkit/containerd - - linuxkit/ca-certificates - - linuxkit/sysctl - - linuxkit/binfmt - - linuxkit/dhcpcd - - linuxkit/rngd + org: + - linuxkit + - library diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 1364bd63c..4f0bea194 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -9,8 +9,6 @@ init: onboot: - name: sysctl image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: dhcpcd image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] @@ -52,5 +50,4 @@ files: trust: org: - linuxkit - image: - - nginx:alpine + - library 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 351478160..58dfb4cf7 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 @@ -11,8 +11,6 @@ onboot: image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0 - name: sysfs image: linuxkit/sysfs:006a65b30cfdd9d751d7ab042fde7eca2c3bc9dc - - name: binfmt - image: linuxkit/binfmt:257b5174a8e33bc62d5448cc026d72cae3713628 - name: format image: linuxkit/format:efafddf9bc6165b5efaf09c532c15a1100a10e61 - name: mount