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 <justin.cormack@docker.com>

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

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

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

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

pkg/dhcpcd/.gitignore

@@ -1,5 +0,0 @@
-bin
-dev
-proc
-sys
-usr

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"]
+CMD ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf"]

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:

pkg/dhcpcd/start_dhcpcd.sh

@@ -1,9 +0,0 @@
-#!bin/sh
-
-set -ex
-
-ip link set eth0 up
-
-cp /dhcpcd.conf /etc/dhcpcd.conf
-
-exec /sbin/dhcpcd --nobackground

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

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

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

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