Skip to content

Commit

Permalink
make: set missing IMAGE_TAG variable
Browse files Browse the repository at this point in the history
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 <robin.hahling@gw-computing.net>
Co-authored-by: Alexandre Perrin <alex@kaworu.ch>
  • Loading branch information
rolinh and kaworu committed Nov 23, 2020
1 parent cd30bae commit 9a7abca
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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.8.0-dev
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)

Expand Down

0 comments on commit 9a7abca

Please sign in to comment.