From 4edb2e4869066498f13dae7d752c445aa726f76f Mon Sep 17 00:00:00 2001 From: Don Khan Date: Sun, 26 Jan 2025 23:25:00 -0500 Subject: [PATCH] Move evaluation to recipe block. (#418) --- docker.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker.mk b/docker.mk index b7b56dbc..4bc42d38 100644 --- a/docker.mk +++ b/docker.mk @@ -44,19 +44,20 @@ else endif docker: download-csm-common + $(eval include csm-common.mk) @echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)" @echo "$(DOCKER_FILE)" $(BUILDER) build -f $(DOCKER_FILE) -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) . docker-no-cache: download-csm-common + $(eval include csm-common.mk) @echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)" @echo "$(DOCKER_FILE) --no-cache" $(BUILDER) build --no-cache -f $(DOCKER_FILE) -t "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) --build-arg BASEIMAGE=$(CSM_BASEIMAGE) . -push: +push: echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)" $(BUILDER) push "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)" download-csm-common: curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk - $(eval include csm-common.mk)