From 7e6cef3db3f8abadd52096f9d4b9cb2fc98e2cf8 Mon Sep 17 00:00:00 2001 From: Pavithra Ramesh Date: Wed, 5 Jun 2019 15:16:21 -0700 Subject: [PATCH] Change dnsmasq compile-image to debian. After the base-image change to debian, dnsmasq built with alpine libraries was running in a debian environment and crashing due to failed dependencies. This change fixes the issue. --- images/dnsmasq/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/dnsmasq/Makefile b/images/dnsmasq/Makefile index a0d0a8901..a92308d11 100644 --- a/images/dnsmasq/Makefile +++ b/images/dnsmasq/Makefile @@ -29,7 +29,7 @@ export DOCKER_CLI_EXPERIMENTAL=enabled ifeq ($(ARCH),amd64) BASEIMAGE ?= k8s.gcr.io/debian-base:v1.0.0 - COMPILE_IMAGE := alpine:3.8 + COMPILE_IMAGE := k8s.gcr.io/debian-base:v1.0.0 else ifeq ($(ARCH),arm) BASEIMAGE ?= k8s.gcr.io/debian-base-arm:v1.0.0 TRIPLE ?= arm-linux-gnueabihf @@ -136,8 +136,8 @@ ifeq ($(ARCH),amd64) -v `pwd`:/src \ $(COMPILE_IMAGE) \ /bin/sh -c \ - "apk update \ - && apk add alpine-sdk xz libcap-dev \ + "apt-get update \ + && apt-get -y install build-essential libcap-dev \ && cd /build/$(DNSMASQ_VERSION) \ && make -j \ && cp src/dnsmasq /build/docker/dnsmasq" $(VERBOSE_OUTPUT)