Add build for the nanny docker image

Dockerfile.dnsmasq-nanny

@@ -0,0 +1,20 @@
+# Copyright 2016 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+FROM gcr.io/google_containers/k8s-dns-dnsmasq-ARG_ARCH:ARG_VERSION
+
+MAINTAINER Bowei Du <[email protected]>
+
+RUN mkdir -p /etc/k8s/dns/dnsmasq-nanny
+ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN
+ENTRYPOINT ["/ARG_BIN"]

Makefile

@@ -51,3 +51,8 @@ VERBOSE ?= 0
 
 # Include standard build rules.
 include rules.mk
+
+# Additional rule to ensure that the dnsmasq image is built before the
+# dnsmasq-nanny image.
+BINARY := dnsmasq-nanny
+.$(BUILDSTAMP_NAME)-container: images-containers

rules.mk

@@ -70,6 +70,7 @@ else
 	VERBOSE_OUTPUT := >/dev/null
 endif
 
+# This MUST appear as the first rule in a Makefile
 all: build
 
 build-%:
@@ -122,10 +123,11 @@ define DOCKERFILE_RULE
 .$(BINARY)-$(ARCH)-dockerfile: Dockerfile.$(BINARY)
 	@echo generating Dockerfile $$@ from $$<
 	@sed					\
-	    -e 's|ARG_BIN|$(BINARY)|g'		\
-	    -e 's|ARG_ARCH|$(ARCH)|g'		\
-	    -e 's|ARG_FROM|$(BASEIMAGE)|g'	\
-	    -e 's|ARG_NOBODY|$(NOBODY)|g'	\
+	    -e 's|ARG_ARCH|$(ARCH)|g' \
+	    -e 's|ARG_BIN|$(BINARY)|g' \
+	    -e 's|ARG_FROM|$(BASEIMAGE)|g' \
+	    -e 's|ARG_NOBODY|$(NOBODY)|g' \
+	    -e 's|ARG_VERSION|$(VERSION)|g' \
 	    $$< > $$@
 .$(BUILDSTAMP_NAME)-container: .$(BINARY)-$(ARCH)-dockerfile
 endef