From 0a030dc21952e644bbbfa73b55c88e74b43c9d85 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 6 Apr 2017 15:32:22 +0100 Subject: [PATCH] Clean up dhcpcd container It is not necessary to bring up `eth0`, the program does it fine. This means we can remove shell script, clean up build. Signed-off-by: Justin Cormack --- examples/gcp.yml | 2 +- examples/sshd.yml | 2 +- examples/vmware.yml | 2 +- moby.yml | 2 +- pkg/dhcpcd/.gitignore | 5 ----- pkg/dhcpcd/Dockerfile | 6 ++---- pkg/dhcpcd/Makefile | 8 ++++---- pkg/dhcpcd/start_dhcpcd.sh | 9 --------- pkg/dhcpcd/{ => usr/lib/dhcpcd/dhcpcd-hooks}/10-mtu | 0 projects/swarmd/swarmd.yml | 2 +- test/ltp/test-ltp.yml | 2 +- test/test.yml | 2 +- test/virtsock/test-virtsock-server.yml | 2 +- 13 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 pkg/dhcpcd/.gitignore delete mode 100755 pkg/dhcpcd/start_dhcpcd.sh rename pkg/dhcpcd/{ => usr/lib/dhcpcd/dhcpcd-hooks}/10-mtu (100%) diff --git a/examples/gcp.yml b/examples/gcp.yml index 155e90171..3334ab04f 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -34,7 +34,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea" binds: - /var:/var - /tmp:/etc diff --git a/examples/sshd.yml b/examples/sshd.yml index e05009b09..f17ac49a7 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -21,7 +21,7 @@ daemon: - CAP_SYS_ADMIN oomScoreAdj: -800 - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea" binds: - /var:/var - /tmp:/etc diff --git a/examples/vmware.yml b/examples/vmware.yml index bc500367e..3074ef1ca 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -24,7 +24,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea" binds: - /var:/var - /tmp:/etc diff --git a/moby.yml b/moby.yml index 1b74c172a..9f86204da 100644 --- a/moby.yml +++ b/moby.yml @@ -24,7 +24,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea" binds: - /var:/var - /tmp/etc:/etc diff --git a/pkg/dhcpcd/.gitignore b/pkg/dhcpcd/.gitignore deleted file mode 100644 index 41e3a19d3..000000000 --- a/pkg/dhcpcd/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -bin -dev -proc -sys -usr diff --git a/pkg/dhcpcd/Dockerfile b/pkg/dhcpcd/Dockerfile index 41d69c8ef..b6894bfaa 100644 --- a/pkg/dhcpcd/Dockerfile +++ b/pkg/dhcpcd/Dockerfile @@ -7,8 +7,6 @@ RUN \ openrc \ && true -ADD dhcpcd.conf /dhcpcd.conf -ADD start_dhcpcd.sh /usr/local/bin/start_dhcpcd.sh -ADD 10-mtu /usr/lib/dhcpcd/dhcpcd-hooks/10-mtu +COPY . . -CMD ["/usr/local/bin/start_dhcpcd.sh"] \ No newline at end of file +CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"] diff --git a/pkg/dhcpcd/Makefile b/pkg/dhcpcd/Makefile index 93dcd073f..7f5d52ae1 100644 --- a/pkg/dhcpcd/Makefile +++ b/pkg/dhcpcd/Makefile @@ -5,7 +5,7 @@ IMAGE=dhcpcd BASE=alpine:3.5 -DEPS=dhcpcd.conf 10-mtu start_dhcpcd.sh +DEPS=dhcpcd.conf usr/lib/dhcpcd/dhcpcd-hooks/10-mtu container: Dockerfile $(DEPS) tar cf - $^ | docker build --no-cache -t $(IMAGE):build - @@ -13,7 +13,7 @@ container: Dockerfile $(DEPS) hash: Dockerfile $(DEPS) DOCKER_CONTENT_TRUST=1 docker pull $(BASE) tar cf - $^ | docker build --no-cache -t $(IMAGE):build - - docker run --rm $(IMAGE):build sh -c '(cat /usr/local/bin/start_dhcpcd.sh /dhcpcd.conf /usr/lib/dhcpcd/dhcpcd-hooks/10-mtu /lib/apk/db/installed) | sha1sum' | sed 's/ .*//' > hash + docker run --rm $(IMAGE):build sh -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash push: hash container docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ @@ -29,6 +29,6 @@ tag: hash container rm -f hash clean: - rm -rf hash $(DIRS) + rm -rf hash -.DELETE_ON_ERROR: \ No newline at end of file +.DELETE_ON_ERROR: diff --git a/pkg/dhcpcd/start_dhcpcd.sh b/pkg/dhcpcd/start_dhcpcd.sh deleted file mode 100755 index 3a84269a5..000000000 --- a/pkg/dhcpcd/start_dhcpcd.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!bin/sh - -set -ex - -ip link set eth0 up - -cp /dhcpcd.conf /etc/dhcpcd.conf - -exec /sbin/dhcpcd --nobackground diff --git a/pkg/dhcpcd/10-mtu b/pkg/dhcpcd/usr/lib/dhcpcd/dhcpcd-hooks/10-mtu similarity index 100% rename from pkg/dhcpcd/10-mtu rename to pkg/dhcpcd/usr/lib/dhcpcd/dhcpcd-hooks/10-mtu diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 1ae8e4140..5ec46eef6 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -24,7 +24,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea" binds: - /var:/var - /tmp/etc:/etc diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index d0b2c100d..55d98172a 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -11,7 +11,7 @@ system: - CAP_SYS_ADMIN daemon: - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea" binds: - /var:/var - /tmp:/etc diff --git a/test/test.yml b/test/test.yml index bc465465c..903cb96e9 100644 --- a/test/test.yml +++ b/test/test.yml @@ -16,7 +16,7 @@ system: readonly: true daemon: - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea" binds: - /var:/var - /tmp:/etc diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml index c4a4409ea..6961296e8 100644 --- a/test/virtsock/test-virtsock-server.yml +++ b/test/virtsock/test-virtsock-server.yml @@ -23,7 +23,7 @@ daemon: oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea" binds: - /var:/var - /tmp:/etc