From eec5687eed6a89d7e6a9c485bb613fcf98802cf6 Mon Sep 17 00:00:00 2001 From: Andreas Peters Date: Sun, 5 May 2024 13:16:44 +0200 Subject: [PATCH] ADD: tag to git push. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 9469c78..521cf52 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #Dockerfile vars #vars -TAG=3.2.8p1_av2 +TAG=v3.2.11p2 IMAGENAME=docker-ispconfig IMAGEFULLNAME=avhost/${IMAGENAME} BRANCH=${shell git symbolic-ref --short HEAD} @@ -29,12 +29,12 @@ else endif build: - @echo ">>>> Build docker image: " ${BRANCH} - @docker build --build-arg TAG=${TAG} --build-arg BUILDDATE=${BUILDDATE} -t ${IMAGEFULLNAME}:${BRANCH} . + @echo ">>>> Build docker image: " ${TAG}_${BRANCH} + @docker build --build-arg TAG=${TAG} --build-arg BUILDDATE=${BUILDDATE} -t ${IMAGEFULLNAME}:${TAG}_${BRANCH} . push: - @echo ">>>> Publish docker image: " ${BRANCH} - @docker build --push --build-arg TAG=${TAG} --build-arg BUILDDATE=${BUILDDATE} -t ${IMAGEFULLNAME}:${BRANCH} . + @echo ">>>> Publish docker image: " ${TAG}_${BRANCH} + @docker build --push --build-arg TAG=${TAG} --build-arg BUILDDATE=${BUILDDATE} -t ${IMAGEFULLNAME}:${TAG}_${BRANCH} . seccheck: grype --add-cpes-if-none dir:.