chore: fix version in build

.github/workflows/docker-push.yml

@@ -19,7 +19,7 @@ jobs:
         name: Get Github tag
         id: meta
         run: |
-          echo "tag=$(git describe --always --tags --match='v*')" >> "$GITHUB_OUTPUT"
+          echo "tag=$(git describe --always --tags --match='v*' | sed -e 's/^v//')" >> "$GITHUB_OUTPUT"
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2

Makefile

@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
 PACKAGES_NOSIMULATION=$(shell go list ./... | grep -v '/simulation')
-VERSION ?= $(shell echo $(shell git describe --tags --always) | sed 's/^v//')
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+GIT_TAGS := $(shell git describe --tags --always)
+VERSION := $(GIT_BRANCH)-$(GIT_TAGS)
 TMVERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::')
 COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true