Skip to content

Commit 4edb2e4

Browse files
authored
Move evaluation to recipe block. (#418)
1 parent cdc48ac commit 4edb2e4

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

docker.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,20 @@ else
4444
endif
4545

4646
docker: download-csm-common
47+
$(eval include csm-common.mk)
4748
@echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
4849
@echo "$(DOCKER_FILE)"
4950
$(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) .
5051

5152
docker-no-cache: download-csm-common
53+
$(eval include csm-common.mk)
5254
@echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
5355
@echo "$(DOCKER_FILE) --no-cache"
5456
$(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) .
5557

56-
push:
58+
push:
5759
echo "MAJOR $(MAJOR) MINOR $(MINOR) PATCH $(PATCH) RELNOTE $(RELNOTE) SEMVER $(SEMVER)"
5860
$(BUILDER) push "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME):v$(MAJOR).$(MINOR).$(PATCH)$(RELNOTE)"
5961

6062
download-csm-common:
6163
curl -O -L https://raw.githubusercontent.com/dell/csm/main/config/csm-common.mk
62-
$(eval include csm-common.mk)

0 commit comments

Comments
 (0)