Commit 552a5bae authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

CT-147: tag the image with suffix '-dev' if built from a git branch diffrent from master.

parent 89545565

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

+4 −2
Original line number Diff line number Diff line
@@ -81,11 +81,13 @@ push: pre-push do-push post-push ## push the image to the Docker registry 


do-push:

	@BRANCH_NAME=`git rev-parse --abbrev-ref HEAD`; \

	echo "--- $$BRANCH_NAME"; \

	echo "Git branch: $$BRANCH_NAME"; \

	if [ $$BRANCH_NAME == "master" ]; then \

	echo "Image tag: $(IMAGE):$(VERSION) $(IMAGE):$(BASE_RELEASE)" ;\

	docker push $(IMAGE):$(BASE_RELEASE); \

	else \

	docker push $(IMAGE):$(VERSION); \

	echo "Image tag: $(IMAGE):$(VERSION) $(IMAGE):$(BASE_RELEASE)-dev" ;\

	docker tag $(IMAGE):$(VERSION) $(IMAGE):$(BASE_RELEASE)-dev ;\

	fi

#	docker push $(IMAGE):latest

csp-lmc-mid/charts/csp-proto/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ csplmc: 
  image:

    registry: nexus.engageska-portugal.pt/ska-docker

    image: mid-csp-lmc

    tag: 0.6.9-1c9b3b9

    tag: 0.6.9-dev

    pullPolicy: IfNotPresent



deviceServers: