Update dnsmasq to 1.3; fix the multiarch build.

Author: luxas

dnsmasq/Changelog

@@ -2,6 +2,5 @@
  - First AMD64-only dnsmasq container
 ## Version 1.2 (Wed June 8 2016 Girish Kalele <[email protected]>
  - Multiple Architecture builds and upgraded to Alpine 3.4
-
-
-
+## Version 1.3 (Fri June 11 2016 Lucas Käldström <[email protected]>)
+ - Patched the multi-architecture images, so they'll work

dnsmasq/Dockerfile.cross

@@ -16,4 +16,8 @@ FROM BASEIMAGE
 MAINTAINER Girish Kalele <[email protected]>
 COPY dnsmasq.conf /etc/dnsmasq.conf
 COPY dnsmasq /usr/sbin/dnsmasq
+
+# This is just a mkdir statement for /var/run in order to keep the complexity of the Makefile down
+WORKDIR /var/run
+WORKDIR /
 ENTRYPOINT ["/usr/sbin/dnsmasq", "--keep-in-foreground"]

dnsmasq/Makefile

@@ -12,34 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Makefile for the Docker image gcr.io/google_containers/dnsmasq
+# Makefile for the Docker image gcr.io/google_containers/kube-dnsmasq-ARCH
 # MAINTAINER: Abhishek Shah <[email protected]>
 # If you update this image please bump the tag value before pushing.
 #
 # Usage:
-#   [TAG=1.0] [REGISTRY=gcr.io/google_containers] [NAMESERVER=127.0.0.1#10053] make container
+#   [TAG=1.3] [REGISTRY=gcr.io/google_containers] make (build|push)
 
 # Default registry, arch and tag. This can be overwritten by arguments to make
-TAG?=1.2
+TAG?=1.3
 REGISTRY?=gcr.io/google_containers
 ARCH?=amd64
 KUBE_CROSS_IMAGE:=$(REGISTRY)/kube-cross:v1.6.2-2
 DNSMASQ_VERSION?=dnsmasq-2.76
 TEMP_DIR:=$(shell mktemp -d)
 
-ifeq ($(ARCH),amd64)
-    BASEIMAGE?=alpine:3.4
-else
-    BASEIMAGE?=$(REGISTRY)/tiny-glibc-$(ARCH):1.0
-endif
-
 ifeq ($(ARCH),arm)
+	BASEIMAGE?=armel/busybox:glibc
     TRIPLE?=arm-linux-gnueabi
 endif
 ifeq ($(ARCH),arm64)
+	BASEIMAGE?=aarch64/busybox:glibc
     TRIPLE?=aarch64-linux-gnu
 endif
 ifeq ($(ARCH),ppc64le)
+	BASEIMAGE?=ppc64le/busybox:glibc
     TRIPLE?=powerpc64le-linux-gnu
 endif