From 4ccafdd920eae43b85f9fb756e653e1dea30b5aa Mon Sep 17 00:00:00 2001 From: Kirill Kolyshkin Date: Sun, 1 Oct 2017 17:34:03 -0700 Subject: [PATCH] CI: update ARM 32 bit build to Zesty Also, use more official / better maintained Docker image repo. Signed-off-by: Kir Kolyshkin Signed-off-by: Andrei Vagin --- scripts/build/Dockerfile.armv7hf.hdr | 2 +- scripts/build/Makefile | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/build/Dockerfile.armv7hf.hdr b/scripts/build/Dockerfile.armv7hf.hdr index 8d4a9c89f..d4f7d9aba 100644 --- a/scripts/build/Dockerfile.armv7hf.hdr +++ b/scripts/build/Dockerfile.armv7hf.hdr @@ -1,3 +1,3 @@ -FROM armv7/armhf-ubuntu +FROM arm32v7/ubuntu:zesty COPY scripts/build/qemu-user-static/usr/bin/qemu-arm-static /usr/bin/qemu-arm-static diff --git a/scripts/build/Makefile b/scripts/build/Makefile index e08943e88..5927b27b7 100644 --- a/scripts/build/Makefile +++ b/scripts/build/Makefile @@ -37,11 +37,9 @@ $(1)-clang: $(1) endef $(foreach t,$(TARGETS),$(eval $(call CLANG_DEP,$(t)))) -%-clang: DB_CC=--build-arg CC=clang-3.8 +%-clang: DB_CC=--build-arg CC=clang %-clang: DB_ENV=--build-arg ENV1=CCACHE_CPP2 -alpine-clang: DB_CC=--build-arg CC=clang -aarch64-clang: DB_CC=--build-arg CC=clang -ppc64le-clang: DB_CC=--build-arg CC=clang +s390x-clang: DB_CC=--build-arg CC=clang-3.8 .PHONY: $(TARGETS_CLANG) clean: