From 18745f6b76504f9b7238c45925db4425740109f1 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 18 Apr 2016 11:34:14 +0100 Subject: [PATCH] fix arm build see #101 #96 Signed-off-by: Justin Cormack --- alpine/Dockerfile | 3 ++- alpine/Makefile | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index cabab1189..975254c0a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -101,7 +101,8 @@ RUN \ rc-update add hupper default && \ rc-update add hv_kvp_daemon default && \ rc-update add hv_vss_daemon default && \ - rc-update add vsudd default + rc-update add vsudd default && \ + true COPY init / diff --git a/alpine/Makefile b/alpine/Makefile index f16ef2f0c..4bcb6871a 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -28,10 +28,16 @@ arm: initrd-arm.img Dockerfile.armhf: Dockerfile cat Dockerfile | \ - sed 's@FROM alpine@FROM justincormack/armhf-alpine@' + sed 's@FROM alpine@FROM justincormack/armhf-alpine@' | \ sed '/hv_/d' | \ sed '/hvtools/d' | \ sed 's/syslinux//' | \ + sed '/proxy/d' | \ + sed '/llmnrd/d' | \ + sed '/diagnostics/d' | \ + sed '/nc-vsock/d' | \ + sed '/vsudd/d' | \ + sed '/gummiboot/d' | \ grep -v 'rc-update add binfmt_misc sysinit' > $@ initrd-arm.img: Dockerfile.armhf