From 1d14ffdb3007ee906a59e0392d4ae78f797d8e77 Mon Sep 17 00:00:00 2001 From: Josh French Date: Tue, 11 Oct 2022 11:13:38 -0400 Subject: Use makefile for a reusable docker image --- Makefile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..7849774 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +.PHONY: clean timestamp setup + +all: setup build + +build: timestamp firmware/$$(TIMESTAMP)-left.uf2 firmware/$$(TIMESTAMP)-right.uf2 + +clean: + rm ./firmware/*.uf2 + +firmware/%-left.uf2 firmware/%-right.uf2: config/adv360.keymap timestamp + docker run --rm -it --name zmk \ + -v $(PWD)/firmware:/app/firmware \ + -v $(PWD)/config:/app/config:ro \ + -e TIMESTAMP=$(TIMESTAMP) \ + zmk + +setup: + docker build --tag zmk . + +timestamp: + $(eval TIMESTAMP:=$(shell date -u +"%Y%m%d%H%M%S")) -- cgit v1.2.3 From 4f09557004c1ef073d5b816432814293bf130f14 Mon Sep 17 00:00:00 2001 From: Josh French Date: Wed, 12 Oct 2022 16:08:31 -0400 Subject: Specify setup prereqs Co-authored-by: Ed Flanagan --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7849774..0e6afcd 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ firmware/%-left.uf2 firmware/%-right.uf2: config/adv360.keymap timestamp -e TIMESTAMP=$(TIMESTAMP) \ zmk -setup: - docker build --tag zmk . +setup: Dockerfile bin/build.sh config/west.yml + docker build --tag zmk --file Dockerfile . timestamp: $(eval TIMESTAMP:=$(shell date -u +"%Y%m%d%H%M%S")) -- cgit v1.2.3 From 7e9cb93cf24f91be6cf2d921fe1ead4c7def9bf4 Mon Sep 17 00:00:00 2001 From: Josh French Date: Thu, 13 Oct 2022 10:22:16 -0400 Subject: timestamp doesn't need to be a target --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0e6afcd..ea54d90 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,15 @@ -.PHONY: clean timestamp setup +TIMESTAMP := $(shell date -u +"%Y%m%d%H%M%S") + +.PHONY: clean setup all: setup build -build: timestamp firmware/$$(TIMESTAMP)-left.uf2 firmware/$$(TIMESTAMP)-right.uf2 +build: firmware/$$(TIMESTAMP)-left.uf2 firmware/$$(TIMESTAMP)-right.uf2 clean: rm ./firmware/*.uf2 -firmware/%-left.uf2 firmware/%-right.uf2: config/adv360.keymap timestamp +firmware/%-left.uf2 firmware/%-right.uf2: config/adv360.keymap docker run --rm -it --name zmk \ -v $(PWD)/firmware:/app/firmware \ -v $(PWD)/config:/app/config:ro \ @@ -16,6 +18,3 @@ firmware/%-left.uf2 firmware/%-right.uf2: config/adv360.keymap timestamp setup: Dockerfile bin/build.sh config/west.yml docker build --tag zmk --file Dockerfile . - -timestamp: - $(eval TIMESTAMP:=$(shell date -u +"%Y%m%d%H%M%S")) -- cgit v1.2.3