Browse Source

Merge pull request #10 from craftyguy/podman

support using podman or docker
V3.0
ReFil 3 years ago committed by GitHub
parent
commit
2b7261c9db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      Dockerfile
  2. 5
      Makefile
  3. 4
      README.md

2
Dockerfile

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
FROM zmkfirmware/zmk-build-arm:stable
FROM docker.io/zmkfirmware/zmk-build-arm:stable
WORKDIR /app

5
Makefile

@ -1,4 +1,5 @@ @@ -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: @@ -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 .

4
README.md

@ -12,10 +12,12 @@ @@ -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.

Loading…
Cancel
Save