Commit 8f03ff3d authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Small bug in tagging the image version.

parent 72fba26a

csp-lmc-mid/docker/.make/.make-release-support

+2 −2
Original line number Diff line number Diff line
@@ -108,10 +108,10 @@ function nextMajorLevel() { 
function getProjectGitTag() {

	proj_name=$(git config --local remote.origin.url|sed -n 's#.*/\([^.]*\)\.git#\1#p')

	if [ -n "$(git tag)" ]; then

		tag_version=$(getBaseTag)$(git tag | sed -e "s/^$proj_name-//")

		tag_version=$(git tag | sed -e "s/^$proj_name-//")

	        echo $tag_version

	else 

	    tag_version=$(getTag)

	    tag_version=$(getVersion)

	    echo $tag_version

	fi

}

csp-lmc-mid/docker/.make/Makefile.mk

+1 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ BASE_VERSION=$(shell . $(RELEASE_SUPPORT) ; getRelease) 
GIT_TAG=$(shell . $(RELEASE_SUPPORT); getProjectGitTag)



#DEFAULT_TAG = image name + BASE_VERSION

DEFAULT_TAG=$(DOCKER_REGISTRY_HOST)/$(DOCKER_REGISTRY_USER)/$(GIT_TAG)

DEFAULT_TAG=$(IMAGE):$(GIT_TAG)





SHELL=/bin/bash
@@ -83,8 +83,6 @@ release: check-status check-release build push 
push: pre-push do-push post-push  ## push the image to the Docker registry



do-push: ## Push the image tagged as $(IMAGE):$(VERSION) and $(DEFAULT_TAG)

	@echo "GIT_TAG: $(GIT_TAG)"

	@echo "DEAFULT_TAG: $(DEFAULT_TAG)"

	@echo -e "Tagging: $(IMAGE):$(VERSION) -> $(DEFAULT_TAG)"

	docker tag $(IMAGE):$(VERSION) $(DEFAULT_TAG)

	@echo -e "Pushing: $(IMAGE):$(VERSION)"