From 137d32c57553cd7a1458cf95cf5cb7e20dad446b Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Wed, 15 Nov 2017 23:45:30 -0800 Subject: [PATCH] Allow building arm images on x86 or arm hosts As handy as cross-build-start is for building arm images on an x86 machine, it actually causes building to fail when on an arm machine. Added an or statement to allow it to build on my rpi as well as my laptop. --- Dockerfile.raspbian | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian index bc21504..7dee36e 100644 --- a/Dockerfile.raspbian +++ b/Dockerfile.raspbian @@ -1,7 +1,7 @@ FROM resin/rpi-raspbian:jessie MAINTAINER ViViDboarder -RUN [ "cross-build-start" ] +RUN cross-build-start || true RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -22,7 +22,7 @@ RUN apt-get update \ python-swiftclient \ && rm -rf /var/apt/lists/* -RUN [ "cross-build-end" ] +RUN cross-build-end || true VOLUME "/root/.cache/duplicity" VOLUME "/backups"