chore(build): add support for multi-arch container

Allows to build a container image for i386 and arm32. Additionally,
using an explicit registry, so that it's compatible with Podman out of
the box.

Author: lmolina

Dockerfile

@@ -1,8 +1,12 @@
 #!/bin/echo run with: docker build . -f
 # -*- coding: utf-8 -*-
 
-FROM arm32v7/debian:stretch AS base
-ENV target_debian_arch=armhf
+ARG ARCH=arm32v7
+ARG TARGET_DEBIAN_ARCH=armhf
+
+FROM docker.io/${ARCH}/debian:stretch AS base
+ARG TARGET_DEBIAN_ARCH=armhf
+ENV target_debian_arch=${TARGET_DEBIAN_ARCH}
 
 LABEL maintainer="Laudin Molina Troconis <laudin.molinatroconis@silabs.com>"
 

docker-compose.yml

@@ -2,10 +2,13 @@
 
 services:
   dev:
-    image: zipgateway-dev
+    image: zipgateway-dev-${ARCH:-arm32v7}
     build:
       context: .
       target: dev
+      args:
+        ARCH: ${ARCH:-arm32v7}
+        TARGET_DEBIAN_ARCH: ${TARGET_DEBIAN_ARCH:-armhf}
     volumes:
       - .:/usr/local/src/zipgateway
     working_dir: /usr/local/src/zipgateway
@@ -18,6 +21,9 @@ services:
     build:
       context: .
       target: runtime
+      args:
+        ARCH: ${ARCH:-arm32v7}
+        TARGET_DEBIAN_ARCH: ${TARGET_DEBIAN_ARCH:-armhf}
     command: tests
     devices:
       - /dev/ttyACM0:/dev/ttyACM0

helper.mk

@@ -11,10 +11,16 @@ default: help all
 SELF?=${CURDIR}/helper.mk
 sudo?=sudo
 build_dir?=build
+compose?=docker-compose
 
 # TODO: adapt for arm and support 64bits
 target_debian_arch?=$(shell dpkg --print-architecture || echo 'i386')
 
+# Map Debian arch name to Docker image arch prefix
+docker_arch_armhf=arm32v7
+docker_arch_i386=i386
+docker_arch?=$(docker_arch_${target_debian_arch})
+
 packages?=make cmake time file git sudo
 packages+=build-essential pkg-config bison flex python
 packages+=libusb-1.0-0-dev libssl-dev libxml2-dev libjson-c-dev
@@ -130,8 +136,17 @@ tests: ${build_dir}
 	cd ${build_dir} && ctest V=1
 
 docker-compose/up: docker-compose.yml
-	docker version
-	docker-compose --version
-	docker-compose up --build
+	${compose} --version
+	ARCH=${docker_arch} TARGET_DEBIAN_ARCH=${target_debian_arch} \
+	  ${compose} up --build
 
 docker/run: docker-compose/up
+
+docker/build/dev: docker-compose.yml
+	${compose} --version
+	ARCH=${docker_arch} TARGET_DEBIAN_ARCH=${target_debian_arch} \
+	  ${compose} up dev --build
+
+docker/run/dev: docker-compose.yml
+	ARCH=${docker_arch} TARGET_DEBIAN_ARCH=${target_debian_arch} \
+	  ${compose} run dev