github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3078 from justincormack/dhcp-hook-fix

Browse Source 
Fix dhcpcd hooks config
This commit is contained in:
Rolf Neugebauer 2018-06-29 19:02:24 +01:00 committed by GitHub
commit 9dac66b831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/aws.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ae402c118338c0285625c0094525eb0a90085a58

2
examples/azure.yml
View File

@ -13,7 +13,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
- name: sshd
image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb
files:

2
examples/cadvisor.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: sysfs
image: linuxkit/sysfs:v0.4

2
examples/docker-for-mac.yml
View File

@ -44,7 +44,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:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
# Enable acpi to shutdown on power events

2
examples/docker.yml
View File

@ -24,7 +24,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
- name: ntpd
image: linuxkit/openntpd:v0.4
- name: docker

2
examples/gcp.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ae402c118338c0285625c0094525eb0a90085a58

2
examples/getty.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty

2
examples/hostmount-writeable-overlay.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
onshutdown:
- name: shutdown

2
examples/influxdb-os.yml
View File

@ -8,7 +8,7 @@ init:
- linuxkit/ca-certificates:v0.4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty

2
examples/minimal.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:27a4c84cc8fab2d5ea04342546ecd20453ec99b3
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty

2
examples/node_exporter.yml
View File

@ -13,7 +13,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
- name: node_exporter
image: linuxkit/node_exporter:v0.4
trust:

2
examples/openstack.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ae402c118338c0285625c0094525eb0a90085a58

2
examples/packet.yml
View File

@ -15,7 +15,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ae402c118338c0285625c0094525eb0a90085a58

2
examples/redis-os.yml
View File

@ -9,7 +9,7 @@ init:
- linuxkit/containerd:27a4c84cc8fab2d5ea04342546ecd20453ec99b3
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty

2
examples/rt-for-vmware.yml
View File

@ -17,7 +17,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
- name: open-vm-tools
image: linuxkit/open-vm-tools:v0.4
- name: nginx

2
examples/scaleway.yml
View File

@ -13,7 +13,7 @@ onboot:
image: linuxkit/rngd:v0.4
command: ["/sbin/rngd", "-1"]
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ae402c118338c0285625c0094525eb0a90085a58

2
examples/sshd.yml
View File

@ -20,7 +20,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
- name: sshd
image: linuxkit/sshd:2c7e6e36bd0ffa2b3d950cf9128da89ba3375dbb
files:

2
examples/swap.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: format
image: linuxkit/format:v0.4

2
examples/tpm.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty

2
examples/vmware.yml
View File

@ -17,7 +17,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
- name: nginx
image: nginx:1.13.8-alpine
capabilities:

2
examples/vpnkit-forwarder.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:27a4c84cc8fab2d5ea04342546ecd20453ec99b3
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: mount-vpnkit
image: alpine:3.7

2
examples/vsudd-containerd.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:27a4c84cc8fab2d5ea04342546ecd20453ec99b3
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: vsudd

2
examples/vultr.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: metadata
image: linuxkit/metadata:ae402c118338c0285625c0094525eb0a90085a58

2
examples/wireguard.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: wg0
image: linuxkit/ip:v0.4

2
linuxkit.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
onshutdown:
- name: shutdown

4
pkg/dhcpcd/Dockerfile
View File

@ -14,5 +14,7 @@ ENTRYPOINT []
CMD []
WORKDIR /
COPY --from=mirror /out/ /
COPY /dhcpcd.conf /usr/ /
# put the config file in / because we bind mount /etc to handle resolv.conf symlinks
COPY /dhcpcd.conf /
COPY /usr/ /usr/
CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"]

2
projects/compose/compose-dynamic.yml
View File

@ -12,7 +12,7 @@ onboot:
- name: sysfs
image: linuxkit/sysfs:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: format
image: linuxkit/format:v0.4

2
projects/compose/compose-static.yml
View File

@ -12,7 +12,7 @@ onboot:
- name: sysfs
image: linuxkit/sysfs:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: format
image: linuxkit/format:v0.4

2
projects/ima-namespace/ima-namespace.yml
View File

@ -11,7 +11,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: rngd

2
projects/logging/examples/logging.yml
View File

@ -11,7 +11,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: rngd

2
projects/memorizer/memorizer.yml
View File

@ -7,7 +7,7 @@ init:
- linuxkit/containerd:27a4c84cc8fab2d5ea04342546ecd20453ec99b3
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty

2
projects/miragesdk/examples/fdd.yml
View File

@ -18,7 +18,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
files:
- path: etc/init.d/020-fdd-init
mode: "0700"

2
projects/okernel/examples/okernel_simple.yaml
View File

@ -11,7 +11,7 @@ onboot:
image: linuxkit/sysctl:v0.4
services:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
- name: getty
image: linuxkit/getty:44730fd0a7c59dbacf5b48b54ba33f551bcf7ef0
env:

2
projects/shiftfs/shiftfs.yml
View File

@ -10,7 +10,7 @@ onboot:
- name: sysctl
image: linuxkit/sysctl:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty

2
test/cases/000_build/000_formats/test.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:v0.4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
trust:
org:

2
test/cases/030_security/000_docker-bench/test.yml
View File

@ -20,7 +20,7 @@ services:
- name: rngd
image: linuxkit/rngd:v0.4
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
- name: docker
image: docker:17.07.0-ce-dind
capabilities:

2
test/cases/040_packages/003_containerd/test.yml
View File

@ -8,7 +8,7 @@ init:
- linuxkit/ca-certificates:v0.4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: sysctl
image: linuxkit/sysctl:v0.4

2
test/cases/040_packages/004_dhcpcd/test.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/runc:v0.4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: test
image: alpine:3.7

2
test/cases/040_packages/007_getty-containerd/test.yml
View File

@ -8,7 +8,7 @@ init:
- linuxkit/ca-certificates:v0.4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
services:
- name: getty

2
test/cases/040_packages/023_wireguard/test.yml
View File

@ -8,7 +8,7 @@ init:
- linuxkit/ca-certificates:v0.4
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: wg0
image: linuxkit/ip:v0.4

2
test/hack/test.yml
View File

@ -9,7 +9,7 @@ init:
- linuxkit/containerd:27a4c84cc8fab2d5ea04342546ecd20453ec99b3
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:v0.4
image: linuxkit/dhcpcd:1fe0db6b1eb7bcb1e4823e61e08afe6d48af7d16
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: check-kernel-config
image: linuxkit/test-kernel-config:a62a6a7ed9ad857c3e1a5a265f3a2e9f6ab1d643