From 0a824fa5a010fd85b60c7e616e38a208fe3ba745 Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 31 Aug 2020 18:43:48 +0200 Subject: [PATCH] Improve makefile structure --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4e9508947..b82735dfc 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ SHA := $(shell git rev-parse --short HEAD) VERSION := $(if $(TAG_NAME),$(TAG_NAME),$(SHA)) BUILD_DATE := $(shell date -u '+%Y-%m-%d_%H:%M:%S') +IMAGE := andig/evcc ALPINE := 3.12 TARGETS := arm.v6,arm.v8,amd64 @@ -41,14 +42,14 @@ release: publish-testing: @echo Version: $(VERSION) $(BUILD_DATE) seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE) \ - --image-name andig/evcc -v "testing" --targets=amd64 + --image-name $(IMAGE) -v "testing" --targets=arm.v6,amd64 publish-latest: @echo Version: $(VERSION) $(BUILD_DATE) seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE) \ - --image-name andig/evcc -v "latest" --targets=$(TARGETS) + --image-name $(IMAGE) -v "latest" --targets=$(TARGETS) publish-images: @echo Version: $(VERSION) $(BUILD_DATE) seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE) \ - --image-name andig/evcc -v "latest" -v "$(TAG_NAME)" --targets=$(TARGETS) + --image-name $(IMAGE) -v "latest" -v "$(TAG_NAME)" --targets=$(TARGETS)