UPDATE: v1.2.0

Author: andreaspeters

Makefile

@@ -2,8 +2,8 @@
 #vars
 IMAGENAME=mesos-compose
 REPO=avhost
-TAG=$(shell git describe --tags --abbrev=0)
-BRANCH=$(shell git symbolic-ref --short HEAD | xargs basename)
+TAG=v1.2.0
+BRANCH=${TAG}
 BRANCHSHORT=$(shell echo ${BRANCH} | awk -F. '{ print $$1"."$$2 }')
 BUILDDATE=$(shell date -u +%Y%m%d)
 IMAGEFULLNAME=${REPO}/${IMAGENAME}
@@ -14,11 +14,6 @@ LASTCOMMIT=$(shell git log -1 --pretty=short | tail -n 1 | tr -d " " | tr -d "UP
 
 .DEFAULT_GOAL := all
 
-ifeq (${BRANCH}, master) 
-	BRANCH=latest
-	BRANCHSHORT=latest
-endif
-
 build:
 	@echo ">>>> Build Docker: latest"
 	@docker build --build-arg TAG=${TAG} --build-arg BUILDDATE=${BUILDDATE} -t ${IMAGEFULLNAME}:latest .
@@ -28,7 +23,7 @@ build-bin:
 	@CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags "-X main.BuildVersion=${BUILDDATE} -X main.GitVersion=${TAG} -extldflags \"-static\"" .
 
 push:
-	@echo ">>>> Publish docker image: " ${BRANCH}
+	@echo ">>>> Publish docker image: " ${BRANCH} ${BRANCHSHORT}
 	@docker buildx create --use --name buildkit
 	@docker buildx build --sbom=true --provenance=true --platform linux/amd64 --push --build-arg TAG=${BRANCH} --build-arg BUILDDATE=${BUILDDATE} -t ${IMAGEFULLNAME}:${BRANCH} .
 	@docker buildx build --sbom=true --provenance=true --platform linux/amd64 --push --build-arg TAG=${BRANCH} --build-arg BUILDDATE=${BUILDDATE} -t ${IMAGEFULLNAME}:${BRANCHSHORT} .

changelog.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## master
+## v1.2.0
 
 - CHANGE: !!!! If compose.networks is set, the network mode will be automaticly "user".
        It can be overwritten if compose.networks.driver is set. !!!!