Remove variant from base tag (#60)

kairos-io · Dec 7, 2023 · 5a07888 · 5a07888
1 parent 29fc485
commit 5a07888
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/versioneer/base_name_test.go b/versioneer/base_name_test.go
@@ -28,7 +28,7 @@ var _ = Describe("BaseContainerName", func() {
 		BeforeEach(func() {
 			id = "master"
 			registryAndOrg = "quay.io/kairos"
-			expectedName = "quay.io/kairos/opensuse:leap-15.5-standard-amd64-generic-master"
+			expectedName = "quay.io/kairos/opensuse:leap-15.5-amd64-generic-master"
 		})
 		It("returns the name", func() {
 			name, err := artifact.BaseContainerName(registryAndOrg, id)

diff --git a/versioneer/versioneer.go b/versioneer/versioneer.go
@@ -139,7 +139,14 @@ func (a *Artifact) BaseContainerName(registryAndOrg, id string) (string, error)
 }
 
 func (a *Artifact) BaseTag() (string, error) {
-	return a.commonName()
+	if err := a.Validate(); err != nil {
+		return "", err
+	}
+
+	result := fmt.Sprintf("%s-%s-%s",
+		a.FlavorRelease, a.Arch, a.Model)
+
+	return result, nil
 }
 
 func (a *Artifact) Tag() (string, error) {