fix(make): correctement obtenir semver depuis git describe
This commit is contained in:
parent
db9d0991df
commit
6ac7ab38d6
1 changed files with 4 additions and 2 deletions
6
Makefile
6
Makefile
|
@ -1,6 +1,8 @@
|
||||||
|
|
||||||
.DEFAULT_GOAL := help
|
.DEFAULT_GOAL := help
|
||||||
|
|
||||||
|
current_semver := $(shell git describe | tr -d 'v' | tr '.' ' ' | tr '-' ' ')
|
||||||
|
|
||||||
.PHONY: help
|
.PHONY: help
|
||||||
help: ## Show this help
|
help: ## Show this help
|
||||||
@egrep -h '\s##\s' $(MAKEFILE_LIST) | \
|
@egrep -h '\s##\s' $(MAKEFILE_LIST) | \
|
||||||
|
@ -37,8 +39,8 @@ deploy: build-container deploy-container ## Build and deploy agecem-org containe
|
||||||
|
|
||||||
.PHONY: docker-tag-from-git
|
.PHONY: docker-tag-from-git
|
||||||
docker-tag-from-git: ## Tag latest image according to annotated tag from `git describe`
|
docker-tag-from-git: ## Tag latest image according to annotated tag from `git describe`
|
||||||
./scripts/docker-tag.sh $(git describe | tr -d 'v' | tr '.' ' ' | tr '-' ' ')
|
./scripts/docker-tag.sh $(current_semver)
|
||||||
|
|
||||||
.PHONY: docker-push-from-git
|
.PHONY: docker-push-from-git
|
||||||
docker-push-from-git: ## Push images to git.agecem.com according to annotated tag from `git describe`
|
docker-push-from-git: ## Push images to git.agecem.com according to annotated tag from `git describe`
|
||||||
./scripts/docker-push.sh $(git describe | tr -d 'v' | tr '.' ' ' | tr '-' ' ')
|
./scripts/docker-push.sh $(current_semver)
|
||||||
|
|
Loading…
Add table
Reference in a new issue