Merge pull request #10 from craftyguy/podman
support using podman or docker
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
FROM zmkfirmware/zmk-build-arm:stable
|
||||
FROM docker.io/zmkfirmware/zmk-build-arm:stable
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
TIMESTAMP := $(shell date -u +"%Y%m%d%H%M%S")
|
||||
DOCKER := $(shell { command -v podman || command -v docker; })
|
||||
|
||||
.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 .
|
||||
|
||||
@@ -12,10 +12,12 @@
|
||||
1. Push a commit to trigger the build.
|
||||
2. Download the artifact.
|
||||
|
||||
## To build Firmware locally using Docker
|
||||
## To build Firmware locally using a container
|
||||
|
||||
### First run
|
||||
|
||||
Note: Either Podman or Docker is required, Podman is preferred if both are present.
|
||||
|
||||
1. Execute `make all`.
|
||||
2. Check the `firmware` directory for the latest firmware build.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user