diff --git a/images/dnsmasq/Makefile b/images/dnsmasq/Makefile index 78e69a232..f751a0260 100644 --- a/images/dnsmasq/Makefile +++ b/images/dnsmasq/Makefile @@ -18,9 +18,9 @@ ARCH ?= amd64 DNSMASQ_VERSION ?= dnsmasq-2.76 CONTAINER_PREFIX ?= k8s-dns -ALL_ARCH := amd64 arm arm64 ppc64le +ALL_ARCH := amd64 arm arm64 ppc64le s390x IMAGE := $(CONTAINER_PREFIX)-dnsmasq-$(ARCH) -COMPILE_IMAGE := gcr.io/google_containers/kube-cross:v1.6.2-2 +COMPILE_IMAGE := gcr.io/google_containers/kube-cross:v1.7.4-1 OUTPUT_DIR := _output/$(ARCH) ifeq ($(ARCH),amd64) diff --git a/rules.mk b/rules.mk index 1242053e1..336ac5dfa 100644 --- a/rules.mk +++ b/rules.mk @@ -27,7 +27,7 @@ export VERSION # directories which hold app source (not vendored) SRC_DIRS := cmd pkg -ALL_ARCH := amd64 arm arm64 ppc64le +ALL_ARCH := amd64 arm arm64 ppc64le s390x # Set default base image dynamically for each arch ifeq ($(ARCH),amd64) BASEIMAGE?=alpine @@ -45,6 +45,10 @@ ifeq ($(ARCH),ppc64le) BASEIMAGE?=ppc64le/busybox NOBODY?=nobody endif +ifeq ($(ARCH),s390x) + BASEIMAGE?=s390x/busybox + NOBODY?=nobody +endif # These rules MUST be expanded at reference time (hence '=') as BINARY # is dynamically scoped.