From 0967b9bdf85eeac5a319cf1c399d27f5e5df7482 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sun, 21 Jan 2024 10:55:05 +0100 Subject: [PATCH] chore: support building ARM image in docker makefile --- .docker/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.docker/Makefile b/.docker/Makefile index 28024901..ea8306ff 100644 --- a/.docker/Makefile +++ b/.docker/Makefile @@ -1,10 +1,14 @@ IMAGE="dwarfs-buildenv" ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) +NPROC:=$(shell nproc) build: docker build -t $(IMAGE) . +build_arm: + docker build -t $(IMAGE) --build-arg ARCH=arm64v8 . + run: @docker run -it --rm \ --cap-add SYS_ADMIN --device /dev/fuse --privileged \ @@ -12,5 +16,5 @@ run: --mount type=bind,source="$(ROOT_DIR)"/../@docker-ccache,target=/ccache \ --mount type=bind,source="$(ROOT_DIR)"/../@docker-home,target=/home/ubuntu \ --mount type=bind,source="$(ROOT_DIR)"/../@docker-build,target=/home/ubuntu/build \ - --env CCACHE_DIR=/ccache --env CTEST_PARALLEL_LEVEL=$(nproc) \ + --env CCACHE_DIR=/ccache --env CTEST_PARALLEL_LEVEL=$(NPROC) \ --entrypoint /bin/bash $(IMAGE)