feat: align image version with version file

Signed-off-by: Chin-Ya Huang <[email protected]>
longhorn · Jul 11, 2024 · 9676aba · 9676aba
1 parent 980da35
commit 9676aba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/dapper/version b/dapper/version
@@ -10,7 +10,7 @@ GIT_TAG=$(git tag -l --contains HEAD | head -n 1)
 if [[ -z "$DIRTY" && -n "$GIT_TAG" ]]; then
     VERSION=$GIT_TAG
 else
-    VERSION="${COMMIT}${DIRTY}"
+    VERSION=$(cat $(dirname $0)/../version)
 fi
 
 GITCOMMIT=$(git rev-parse HEAD)

diff --git a/pkg/consts/longhornctl.go b/pkg/consts/longhornctl.go
@@ -1,11 +1,19 @@
 package consts
 
+import (
+	"fmt"
+
+	"github.com/longhorn/cli/meta"
+)
+
 const (
 	ImageBciBase = "registry.suse.com/bci/bci-base:15.5"
 	ImagePause   = "registry.k8s.io/pause:3.1"
+)
 
-	ImageEngine      = "longhornio/longhorn-engine:master-head"
-	ImageLonghornctl = "longhornio/longhornctl:master-head"
+var (
+	ImageEngine      = fmt.Sprintf("longhornio/longhorn-engine:%s", meta.Version)
+	ImageLonghornctl = fmt.Sprintf("longhornio/longhornctl:%s", meta.Version)
 )
 
 const (