diff --git a/images/.utils/container-build.mk b/images/.utils/container-build.mk index 520df59c25580e9ac9638dc72da0bd167921446e..447a314e2bb4c6b3745c4f48610b0b7cd783d3c0 100644 --- a/images/.utils/container-build.mk +++ b/images/.utils/container-build.mk @@ -32,7 +32,7 @@ DOCKER_FILE_PATH=Containerfile .PHONY: pre-build docker-build post-build build release patch-release minor-release major-release tag check-status check-release showver \ push pre-push do-push post-push -build: pre-build docker-build post-build +build: pre-build docker-build post-build ## build and tag container pre-build: @@ -59,18 +59,18 @@ docker-build: .release @cat .release -release: check-status check-release build push +release: check-status check-release build push ## build release from current git tag and push to registry -push: pre-push do-push post-push +push: pre-push do-push post-push ## Push current image to registry do-push: podman push $(IMAGE):$(VERSION) podman push $(IMAGE):latest -snapshot: build push +snapshot: build push ## Build current state and push to registry -showver: .release +showver: .release ## Print current container tag @. $(RELEASE_SUPPORT); getVersion tag-patch-release: VERSION := $(shell . $(RELEASE_SUPPORT); nextPatchLevel) @@ -82,13 +82,13 @@ tag-minor-release: .release tag tag-major-release: VERSION := $(shell . $(RELEASE_SUPPORT); nextMajorLevel) tag-major-release: .release tag -patch-release: tag-patch-release release +patch-release: tag-patch-release release ## Release new patch version @echo $(VERSION) -minor-release: tag-minor-release release +minor-release: tag-minor-release release ## Release new minor version @echo $(VERSION) -major-release: tag-major-release release +major-release: tag-major-release release ## Release new major version @echo $(VERSION) diff --git a/images/demo/Makefile b/images/demo/Makefile index 0869882fc9196ab6ed616ae0b61e295268d7563e..ef36bf84f13aa483c38c37c511a4f5ec4929b39f 100644 --- a/images/demo/Makefile +++ b/images/demo/Makefile @@ -1,4 +1,5 @@ include ../.utils/container-build.mk +include ../../utils/help.mk pre-build: @echo do some stuff before the docker build