Merge pull request #1192 from luxas/fix_dnsmasq

Update dnsmasq to 1.3; fix the multiarch build and remove tiny-glibc

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

@@ -13,7 +13,11 @@
 # limitations under the License.
 
 FROM BASEIMAGE
+# If we're building for another architecture than amd64, the CROSS_BUILD_ placeholder is removed so e.g. CROSS_BUILD_COPY turns into COPY
+# If we're building normally, for amd64, CROSS_BUILD lines are removed
+CROSS_BUILD_COPY qemu-ARCH-static /usr/bin/
 MAINTAINER Girish Kalele <[email protected]>
 COPY dnsmasq.conf /etc/dnsmasq.conf
 COPY dnsmasq /usr/sbin/dnsmasq
+RUN mkdir /var/run/
 ENTRYPOINT ["/usr/sbin/dnsmasq", "--keep-in-foreground"]

dnsmasq/Makefile

@@ -12,52 +12,61 @@
 # 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
+    QEMUARCH=arm
 endif
 ifeq ($(ARCH),arm64)
+	BASEIMAGE?=aarch64/busybox:glibc
     TRIPLE?=aarch64-linux-gnu
+    QEMUARCH=aarch64
 endif
 ifeq ($(ARCH),ppc64le)
+	BASEIMAGE?=ppc64le/busybox:glibc
     TRIPLE?=powerpc64le-linux-gnu
+    QEMUARCH=ppc64le
 endif
 
 all: build
 
 build:
 ifeq ($(ARCH),amd64)
 	cp Dockerfile $(TEMP_DIR)
+	# When building "normally" for amd64, remove the whole line, it has no part in the amd64 image
+	cd $(TEMP_DIR) && sed -i "/CROSS_BUILD_/d" Dockerfile
 else
 	cp Dockerfile.cross $(TEMP_DIR)/Dockerfile
-	sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" $(TEMP_DIR)/Dockerfile
+	cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
+	cd $(TEMP_DIR) && sed -i "s|ARCH|$(QEMUARCH)|g" Dockerfile
 
 	# Build the dnsmasq binary using the cross-compilation docker image
 	docker run -it --rm -v $(TEMP_DIR):/build $(KUBE_CROSS_IMAGE) /bin/bash -c \
 	"curl -sSL  http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ_VERSION).tar.xz | tar -xJ \
 	&& cd $(DNSMASQ_VERSION) \
 	&& CC=$(TRIPLE)-gcc make \
 	&& cp src/dnsmasq /build"
+
+	# When cross-building, only the placeholder "CROSS_BUILD_" should be removed
+	# Register /usr/bin/qemu-ARCH-static as the handler for ARM binaries in the kernel
+	docker run --rm --privileged multiarch/qemu-user-static:register --reset
+	curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-$(QEMUARCH)-static.tar.xz | tar -xJ -C $(TEMP_DIR)
+	cd $(TEMP_DIR) && sed -i "s/CROSS_BUILD_//g" Dockerfile
 endif
 	cp dnsmasq.conf $(TEMP_DIR)
 	docker build -t $(REGISTRY)/kube-dnsmasq-$(ARCH):$(TAG) $(TEMP_DIR)