From df417b1aff4d31b25e1e0fea9c388d724ec000a5 Mon Sep 17 00:00:00 2001 From: Arthur Meyre Date: Mon, 13 Dec 2021 10:55:36 +0100 Subject: [PATCH] chore: fix dev docker build on macOS closes #1161 --- Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 634626769..faf44dcc7 100644 --- a/Makefile +++ b/Makefile @@ -147,13 +147,21 @@ mypy_ci: .PHONY: docker_build # Build dev docker docker_build: - docker build --build-arg BUILD_UID=$$(id -u) --build-arg BUILD_GID=$$(id -g) --pull \ - -t $(DEV_DOCKER_IMG) -f $(DEV_DOCKERFILE) . + BUILD_ARGS=; \ + if [[ $$(uname) == "Linux" ]]; then \ + BUILD_ARGS="--build-arg BUILD_UID=$$(id -u) --build-arg BUILD_GID=$$(id -g)"; \ + fi; \ + docker build $${BUILD_ARGS:+BUILD_ARGS} \ + --pull -t $(DEV_DOCKER_IMG) -f $(DEV_DOCKERFILE) . .PHONY: docker_rebuild # Rebuild docker docker_rebuild: docker_clean_volumes - docker build --build-arg BUILD_UID=$$(id -u) --build-arg BUILD_GID=$$(id -g) --pull \ - --no-cache -t $(DEV_DOCKER_IMG) -f $(DEV_DOCKERFILE) . + BUILD_ARGS=; \ + if [[ $$(uname) == "Linux" ]]; then \ + BUILD_ARGS="--build-arg BUILD_UID=$$(id -u) --build-arg BUILD_GID=$$(id -g)"; \ + fi; \ + docker build $${BUILD_ARGS:+BUILD_ARGS} \ + --pull --no-cache -t $(DEV_DOCKER_IMG) -f $(DEV_DOCKERFILE) . .PHONY: docker_start # Launch docker docker_start: