update makefile
This commit is contained in:
parent
74de85615c
commit
5bc6e49204
35
Makefile
35
Makefile
@ -5,24 +5,27 @@ help:
|
|||||||
|
|
||||||
repo=yardstick
|
repo=yardstick
|
||||||
project=braid
|
project=braid
|
||||||
tag=$(shell git rev-parse --short=7 HEAD)
|
|
||||||
branch=$(shell git rev-parse --abbrev-ref HEAD)
|
branch=$(shell git rev-parse --abbrev-ref HEAD)
|
||||||
version=$(shell git describe --exact-match --tags $(git log -n1 --pretty='%h'))
|
tag=$(shell echo $(branch) | grep -Eo 'feature/([A-Za-z]+-[0-9]*)' | grep -Eo '[A-Za-z]+-[0-9]*' || \
|
||||||
|
echo $(branch) | grep -Eo '(release|hotfix)/[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+' | grep -Eo '[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+' || \
|
||||||
|
echo $(branch) | grep -Eo 'YASDEV-([[:digit:]]*)')
|
||||||
full: build push ## build the docker container completely
|
full: build push
|
||||||
|
|
||||||
|
|
||||||
build: ## build the production dockerfile
|
build: ## build the production dockerfile
|
||||||
docker build -t $(repo)/$(project):$(tag) \
|
@if [[ -n "$(tag)" ]]; then \
|
||||||
-t $(repo)/$(project):$(branch) \
|
echo "$(tag)" > docker_tag.txt; \
|
||||||
.
|
docker build -t $(repo)/$(project):$(tag) .; \
|
||||||
if git describe --exact-match --tags $(shell git log -n1 --pretty='%h'); then \
|
else \
|
||||||
docker tag $(repo)/$(project):$(tag) $(repo)/$(project):$(version); \
|
echo "Nothing to build."; \
|
||||||
fi
|
fi
|
||||||
push: ## push the production dockerfile
|
push: ## push the production dockerfile
|
||||||
docker push $(repo)/$(project):$(tag)
|
@if [[ -n "$(tag)" ]]; then \
|
||||||
docker push $(repo)/$(project):$(branch)
|
docker push $(repo)/$(project):$(tag); \
|
||||||
if git describe --exact-match --tags $(shell git log -n1 --pretty='%h'); then \
|
else \
|
||||||
docker push $(repo)/$(project):$(version); \
|
echo "Nothing to push."; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
display: ## display the tag/branch values for development testing
|
||||||
|
@echo "branch: $(branch)"
|
||||||
|
@echo "tag: $(tag)"
|
Loading…
x
Reference in New Issue
Block a user