From c74ccf9a07312e77759a7108ae4212c23464c068 Mon Sep 17 00:00:00 2001
From: Peter Argue <89119817+peterargue@users.noreply.github.com>
Date: Tue, 1 Aug 2023 11:37:53 -0700
Subject: [PATCH 1/2] [Localnet] Fix semver for localnet builds

---
 integration/localnet/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/integration/localnet/Makefile b/integration/localnet/Makefile
index 30af385fae3..e5f882882a4 100644
--- a/integration/localnet/Makefile
+++ b/integration/localnet/Makefile
@@ -22,7 +22,11 @@ LOGLEVEL=DEBUG
 
 # The Git commit hash
 COMMIT=$(shell git rev-parse HEAD)
-VERSION=localnetbuild
+
+# The version to include in container builds. Must be semver compliant
+ifeq ($(VERSION),)
+	VERSION := $(shell git describe --tags --abbrev=2 --match "v*" --match "secure-cadence*" 2>/dev/null)-localnetbuild
+endif
 
 CURRENT_DIRECTORY=$(shell pwd)
 

From 25863781a16b62f3c8107a6a362837a3a77bac23 Mon Sep 17 00:00:00 2001
From: Peter Argue <89119817+peterargue@users.noreply.github.com>
Date: Wed, 9 Aug 2023 10:35:24 -0700
Subject: [PATCH 2/2] Update integration/localnet/Makefile

Co-authored-by: Janez Podhostnik <67895329+janezpodhostnik@users.noreply.github.com>
---
 integration/localnet/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration/localnet/Makefile b/integration/localnet/Makefile
index e5f882882a4..a2a035f4a93 100644
--- a/integration/localnet/Makefile
+++ b/integration/localnet/Makefile
@@ -25,7 +25,7 @@ COMMIT=$(shell git rev-parse HEAD)
 
 # The version to include in container builds. Must be semver compliant
 ifeq ($(VERSION),)
-	VERSION := $(shell git describe --tags --abbrev=2 --match "v*" --match "secure-cadence*" 2>/dev/null)-localnetbuild
+	VERSION := $(shell git describe --tags --abbrev=2 --match "v*" 2>/dev/null)-localnetbuild
 endif
 
 CURRENT_DIRECTORY=$(shell pwd)