From 5811f6e4f735fd0bc43830ed19adb5d10817a4be Mon Sep 17 00:00:00 2001 From: "Andrea F. Daniele" Date: Tue, 19 Nov 2019 12:37:37 -0600 Subject: [PATCH] added support for arm images --- duckiebot/Dockerfile | 3 ++- duckiebot/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/duckiebot/Dockerfile b/duckiebot/Dockerfile index 5f1b136..676a5a7 100644 --- a/duckiebot/Dockerfile +++ b/duckiebot/Dockerfile @@ -1,5 +1,6 @@ # We start from a base ROS image -FROM duckietown/dt-core:daffy-amd64 +ARG ARCH=amd64 +FROM duckietown/dt-core:daffy-${ARCH} RUN apt-get update -y && apt-get install -y --no-install-recommends \ gcc \ diff --git a/duckiebot/Makefile b/duckiebot/Makefile index edf01c8..61f1b53 100644 --- a/duckiebot/Makefile +++ b/duckiebot/Makefile @@ -1,12 +1,13 @@ repo=challenge-aido_lf-duckiebot branch=$(shell git rev-parse --abbrev-ref HEAD) tag=duckietown/$(repo):$(branch) +arch=amd64 build: - docker build --pull -t $(tag) . + docker build --pull -t $(tag) --build-arg ARCH=$(arch) . build-no-cache: - docker build --pull -t $(tag) --no-cache . + docker build --pull -t $(tag) --build-arg ARCH=$(arch) --no-cache . push: build docker push $(tag)