From c7d7b4015f3f40d26acb3d8ea4a38131c8124889 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Sun, 23 Oct 2022 21:32:10 -0700 Subject: [PATCH] Add support for using podman if docker is unavailable --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ea54d90d64..672da3a6c4 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ TIMESTAMP := $(shell date -u +"%Y%m%d%H%M%S") +DOCKER := $(shell { command -v docker || command -v podman; }) .PHONY: clean setup @@ -10,11 +11,11 @@ clean: rm ./firmware/*.uf2 firmware/%-left.uf2 firmware/%-right.uf2: config/adv360.keymap - docker run --rm -it --name zmk \ + $(DOCKER) run --rm -it --name zmk \ -v $(PWD)/firmware:/app/firmware \ -v $(PWD)/config:/app/config:ro \ -e TIMESTAMP=$(TIMESTAMP) \ zmk setup: Dockerfile bin/build.sh config/west.yml - docker build --tag zmk --file Dockerfile . + $(DOCKER) build --tag zmk --file Dockerfile .