Merge pull request #470 from Iceber/fix_image_version

fix image version when multiple tags exist on HEAD

.github/workflows/push-images.yml

@@ -1,8 +1,6 @@
 name: Push Images
 on:
   push:
-    branches:
-      - main
     tags:
       - v*
 jobs:
@@ -25,4 +23,4 @@ jobs:
         env:
           ON_PLUGINS: true
         run: |
-          REGISTRY="ghcr.io/$(echo ${{ github.repository }} | tr "A-Z" "a-z")" make push-images
+          REGISTRY="ghcr.io/$(echo ${{ github.repository }} | tr "A-Z" "a-z")" VERSION=${{ github.ref_name }} make push-images

Makefile

@@ -5,10 +5,9 @@ GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 RELEASE_ARCHS ?= amd64 arm64
 
-VERSION ?= "latest"
-LATEST_TAG=$(shell git describe --tags)
-ifeq ($(LATEST_TAG),$(shell git describe --abbrev=0 --tags))
-	VERSION=$(LATEST_TAG)
+VERSION ?= $(shell git tag --points-at HEAD --sort -version:refname "v*" | head -1)
+ifeq ($(VERSION),)
+	VERSION="latest"
 endif
 
 BUILDER_IMAGE_TAG = $(shell git rev-parse HEAD)