Merge pull request #5 from duckietown-ttic/daffy

added support for arm images
gibernas · Nov 19, 2019 · eaa5f8e · eaa5f8e
2 parents 368ff46 + 5811f6e
commit eaa5f8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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)