From 8bce00638c9adbc9c55ed25eee51e8e0dc9d1903 Mon Sep 17 00:00:00 2001 From: Robin Hahling Date: Fri, 20 Nov 2020 15:23:03 +0100 Subject: [PATCH] make: set missing IMAGE_TAG variable This variable is used to set the tag for the docker image. It is now set to `latest` if the version string contains `-dev` and to the `v${VERSION}` otherwise and was previously unassigned leading to always produce `latest` when building a docker image. Signed-off-by: Robin Hahling Co-authored-by: Alexandre Perrin --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 62798fc7a..866cb4d69 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,14 @@ GO := CGO_ENABLED=0 go INSTALL = $(QUIET)install BINDIR ?= /usr/local/bin -IMAGE_REPOSITORY ?= quay.io/cilium/hubble -CONTAINER_ENGINE ?= docker TARGET=hubble VERSION=0.7.1 GIT_BRANCH = $(shell which git >/dev/null 2>&1 && git rev-parse --abbrev-ref HEAD) GIT_HASH = $(shell which git >/dev/null 2>&1 && git rev-parse --short HEAD) GO_TAGS ?= +IMAGE_REPOSITORY ?= quay.io/cilium/hubble +IMAGE_TAG ?= $(if $(findstring -dev,$(VERSION)),latest,v$(VERSION)) +CONTAINER_ENGINE ?= docker RELEASE_UID ?= $(shell id -u) RELEASE_GID ?= $(shell id -g)