Commit 72fba26a authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Create image with git tag version.

parent 8c88e09c

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

+11 −0
Original line number Diff line number Diff line
@@ -104,3 +104,14 @@ function nextMajorLevel() { 
	version=$(printf "%d.0.0" $(($major + 1)))

	echo $version

}



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-//")

	        echo $tag_version

	else 

	    tag_version=$(getTag)

	    echo $tag_version

	fi

}

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

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
UFFA

0.1.dev40+at5.259.76fd13a.dirty

AT5.259

None

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

+6 −3
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ VERSION=$(shell . $(RELEASE_SUPPORT) ; getVersion) 
#BASE_VERSION

BASE_VERSION=$(shell . $(RELEASE_SUPPORT) ; getRelease)



#TAG = project name + release version

TAG=$(shell . $(RELEASE_SUPPORT); getTag)

#TAG = project name + git tag version

GIT_TAG=$(shell . $(RELEASE_SUPPORT); getProjectGitTag)



#DEFAULT_TAG = image name + BASE_VERSION

DEFAULT_TAG=$(IMAGE):$(BASE_VERSION)

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





SHELL=/bin/bash
@@ -64,6 +64,7 @@ pre-push: 
post-push:



docker-build: .release

	@echo "VERSION: $(VERSION)"

	@echo "Building image: $(IMAGE):$(VERSION)"

	@echo "NAME: $(NAME)"

	docker build $(DOCKER_BUILD_ARGS) -t $(IMAGE):$(VERSION) $(DOCKER_BUILD_CONTEXT) -f $(DOCKER_FILE_PATH) --build-arg DOCKER_REGISTRY_HOST=$(DOCKER_REGISTRY_HOST) --build-arg DOCKER_REGISTRY_USER=$(DOCKER_REGISTRY_USER)
@@ -82,6 +83,8 @@ 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)"