From 0add33e288e46eea754c6eab75ad6d89323a5283 Mon Sep 17 00:00:00 2001 From: Isaac Rodman Date: Wed, 20 Sep 2017 15:11:43 -0700 Subject: [PATCH 1/2] added capability to pkg/dhcpcd for sethostname Signed-off-by: Isaac Rodman --- pkg/dhcpcd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 0739dbbfd..0ebb1ef1e 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -16,4 +16,4 @@ WORKDIR / COPY --from=mirror /out/ / COPY /dhcpcd.conf /usr/ / CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"] -LABEL org.mobyproject.config='{"binds": ["/run/resolvconf:/etc"], "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW"]}' +LABEL org.mobyproject.config='{"binds": ["/run/resolvconf:/etc"], "capabilities": ["CAP_NET_ADMIN", "CAP_NET_BIND_SERVICE", "CAP_NET_RAW", "CAP_SYS_ADMIN"]}' From 542ad766b7467fb4b07cb7d975ea3a3b2c7a99ef Mon Sep 17 00:00:00 2001 From: Isaac Rodman Date: Thu, 21 Sep 2017 10:46:03 -0700 Subject: [PATCH 2/2] switched linuxkit/dhcpcd hash to d4408777ed6b6e6e562a5d4938fd09804324b33e for PR #2527 Signed-off-by: Isaac Rodman --- blueprints/docker-for-mac/base.yml | 2 +- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd.yml | 2 +- examples/vultr.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/etcd/etcd.yml | 2 +- projects/etcd/prom-us-central1-f.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/kubernetes/kube.yml | 2 +- projects/logging/examples/logging.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- projects/swarmd/swarmd.yml | 2 +- test/cases/000_build/000_outputs/test.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/hack/test.yml | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index 1d4a30aed..aa0ea3d71 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -40,7 +40,7 @@ onboot: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: # Enable acpi to shutdown on power events diff --git a/examples/aws.yml b/examples/aws.yml index d4c9fe013..af426f2a4 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 diff --git a/examples/azure.yml b/examples/azure.yml index 1f3edd7ac..73ad65595 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -13,7 +13,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e - name: sshd image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 files: diff --git a/examples/docker.yml b/examples/docker.yml index ede8412e7..2cd8991c9 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -24,7 +24,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e - name: ntpd image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67 - name: docker diff --git a/examples/gcp.yml b/examples/gcp.yml index 4f7fe2b7a..6ac112990 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 diff --git a/examples/getty.yml b/examples/getty.yml index 642b32615..8b2ad3507 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty diff --git a/examples/minimal.yml b/examples/minimal.yml index 70c2b2725..dec9b0604 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 22c30a12a..3ff47c574 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -13,7 +13,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e - name: node_exporter image: linuxkit/node_exporter:a058fe1c6a4440a9689022a9fd7cffdcfd56d52c trust: diff --git a/examples/packet.yml b/examples/packet.yml index 2b0561499..8abfd0857 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -13,7 +13,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 2603e4936..e3fa2cec7 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -9,7 +9,7 @@ init: - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty diff --git a/examples/sshd.yml b/examples/sshd.yml index 53f0e7494..579d594be 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -20,7 +20,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e - name: sshd image: linuxkit/sshd:d313eea3d9d7fbcbc927d06a6700325725db2a82 files: diff --git a/examples/swap.yml b/examples/swap.yml index 02da030c5..7535720b8 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 diff --git a/examples/tpm.yml b/examples/tpm.yml index 139235580..3a6c115c5 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty diff --git a/examples/vmware.yml b/examples/vmware.yml index 305a27356..444172c41 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -17,7 +17,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e - name: nginx image: nginx:alpine capabilities: diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index c8d510059..6c68a0098 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit image: alpine:3.6 diff --git a/examples/vsudd.yml b/examples/vsudd.yml index c2f3e684c..fec8c3e13 100644 --- a/examples/vsudd.yml +++ b/examples/vsudd.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: vsudd diff --git a/examples/vultr.yml b/examples/vultr.yml index 1925f3961..e663e2cf5 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 9735bd298..f57612e13 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 image: linuxkit/ip:adedf00ca91ed0ed91a40aa76ce23309b32fcb47 diff --git a/linuxkit.yml b/linuxkit.yml index 748c230fa..4b7aa692d 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] onshutdown: - name: shutdown diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index bad092aab..6d4838440 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 7fe13f83c..4d1d283a7 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -12,7 +12,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 diff --git a/projects/etcd/etcd.yml b/projects/etcd/etcd.yml index 3dbdf93de..df65a9748 100644 --- a/projects/etcd/etcd.yml +++ b/projects/etcd/etcd.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 command: ["/usr/bin/mountie", "/var/lib/etcd"] - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 diff --git a/projects/etcd/prom-us-central1-f.yml b/projects/etcd/prom-us-central1-f.yml index b2d08c558..77dcf69e5 100644 --- a/projects/etcd/prom-us-central1-f.yml +++ b/projects/etcd/prom-us-central1-f.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index a6c2d88bd..1f299b19e 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -11,7 +11,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd diff --git a/projects/kubernetes/kube.yml b/projects/kubernetes/kube.yml index fd0e1f450..e4b5b888a 100644 --- a/projects/kubernetes/kube.yml +++ b/projects/kubernetes/kube.yml @@ -15,7 +15,7 @@ onboot: - name: sysfs image: linuxkit/sysfs:3ae01a25583ee37a5ff8b09a0e569cb4bd8cf2e9 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: metadata image: linuxkit/metadata:da3138079c168e0c5608d8f3853366c113ed91d2 diff --git a/projects/logging/examples/logging.yml b/projects/logging/examples/logging.yml index 5bd4b3bb6..050ae3839 100644 --- a/projects/logging/examples/logging.yml +++ b/projects/logging/examples/logging.yml @@ -11,7 +11,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: rngd diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 13834213f..c4e9ca320 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 5afc8ef5d..2227c2137 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -18,7 +18,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e files: - path: etc/init.d/020-fdd-init mode: "0700" diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index 6e79de741..85d89c773 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -11,7 +11,7 @@ onboot: image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 services: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e - name: getty image: linuxkit/getty:bf6872ce0a9f3ab519b3e502cc41ba3958bda2a6 env: diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 34aa4c707..b3c4e4c51 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -10,7 +10,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index e8d8f3507..951f8f9e9 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -12,7 +12,7 @@ onboot: binds: - /etc/sysctl.d/01-swarmd.conf:/etc/sysctl.d/01-swarmd.conf - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: format image: linuxkit/format:158d992b7bf7ab984100c697d7e72161ea7d7382 diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_outputs/test.yml index 963b15a54..7d63455bc 100644 --- a/test/cases/000_build/000_outputs/test.yml +++ b/test/cases/000_build/000_outputs/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] trust: org: diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index a74c29497..22e4647fc 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -20,7 +20,7 @@ services: - name: rngd image: linuxkit/rngd:558e86a36242bb74353bc9287b715ddb8567357e - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e - name: docker image: docker:17.07.0-ce-dind capabilities: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 8777bbd39..b1804696d 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -8,7 +8,7 @@ init: - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: sysctl image: linuxkit/sysctl:154913b72c6f1f33eb408609fca9963628e8c051 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index f832df1c7..e82d3c4a2 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:a1b564248a0d0b118c11e61db9f84ecf41dd2d2a onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test image: alpine:3.6 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index be7eadd34..8fae7aded 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -8,7 +8,7 @@ init: - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] services: - name: getty diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 59918f6ba..f8d08040f 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -8,7 +8,7 @@ init: - linuxkit/ca-certificates:e44b0a66df5a102c0e220f0066b0d904710dcb10 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: wg0 image: linuxkit/ip:adedf00ca91ed0ed91a40aa76ce23309b32fcb47 diff --git a/test/hack/test.yml b/test/hack/test.yml index 46dafdac8..9453f273b 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -9,7 +9,7 @@ init: - linuxkit/containerd:06876ceef325e49e9ba119659357768d5df89075 onboot: - name: dhcpcd - image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7 + image: linuxkit/dhcpcd:d4408777ed6b6e6e562a5d4938fd09804324b33e command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: check-kernel-config image: linuxkit/test-kernel-config:d58766bb6c0def3df9e6ffc645ee11677f127faa