adds additional api_version check, and only shows version once

superterran · Oct 30, 2021 · b46ae4b · b46ae4b
1 parent e31f805
commit b46ae4b
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/cmd/build.go b/cmd/build.go
@@ -233,7 +233,13 @@ func getApiVersion(filename string) string {
 
 	content, err := ioutil.ReadFile(filepath.Dir(filename) + "/API_VERSION")
 	if err != nil {
-		return ""
+		content, err := ioutil.ReadFile(filepath.Dir(filename) + "/../API_VERSION")
+		if err != nil {
+
+			return ""
+		} else {
+			return string(content) + "-"
+		}
 	} else {
 		return string(content) + "-"
 	}
@@ -244,7 +250,16 @@ func getApiVersion(filename string) string {
 // using a variant in the filename (detailed below) or by using a git branch other than the default
 func getTag(filename string) string {
 
-	var tag string = getApiVersion(filename) + filepath.Base(filepath.Dir(filename)) + getVariant(filename)
+	var apiVersion = getApiVersion(filename)
+	var variant = getVariant(filename)
+
+	var tag string
+
+	if apiVersion == variant {
+		tag = getApiVersion(filename) + filepath.Base(filepath.Dir(filename))
+	} else {
+		tag = getApiVersion(filename) + filepath.Base(filepath.Dir(filename)) + getVariant(filename)
+	}
 
 	if DockerRegistry != "" {
 		return DockerRegistry + ":" + tag