Append has to docker images

nearform · Jul 13, 2023 · 1a02f5d · 1a02f5d
1 parent dda46e8
commit 1a02f5d
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 10 deletions.
diff --git a/src/cli/build.go b/src/cli/build.go
@@ -8,7 +8,11 @@ import (
 )
 
 func (c *CLI) Build(cCtx *cli.Context) error {
-	project := c.getProject(cCtx)
+	project, err := c.getProject(cCtx)
+	if err != nil {
+		return err
+	}
+
 	logger.PrintInfo("Dockerfile Location: " + path.Join(project.Directory, c.DockerService.DockerFileName))
 	return c.DockerService.Build()
 }

diff --git a/src/cli/cli.go b/src/cli/cli.go
@@ -2,12 +2,14 @@ package cli
 
 import (
 	"embed"
+	"fmt"
 	"io"
 	"os"
 	"path"
 	"path/filepath"
 	"sort"
 
+	"github.com/nearform/k8s-kurated-addons-cli/src/services/git"
 	"github.com/nearform/k8s-kurated-addons-cli/src/services/project"
 	"k8s.io/utils/strings/slices"
 
@@ -38,7 +40,7 @@ func (c CLI) baseBeforeFunc(ctx *cli.Context) error {
 	return nil
 }
 
-func (c *CLI) init(cCtx *cli.Context) {
+func (c *CLI) init(cCtx *cli.Context) error {
 	appName := cCtx.String(appNameFlag)
 	version := cCtx.String(appVersionFlag)
 	projectDirectory := cCtx.String(projectDirectoryFlag)
@@ -64,11 +66,18 @@ func (c *CLI) init(cCtx *cli.Context) {
 		dockerImageName = appName + "/" + base
 	}
 
+	hash, err := git.GetHash()
+	if err != nil {
+		return err
+	}
+
+	tag := fmt.Sprintf("%s-%s", version, hash)
+
 	dockerImage := docker.DockerImage{
 		Registry:  cCtx.String(repoNameFlag),
 		Name:      dockerImageName,
 		Directory: absProjectDirectory,
-		Tag:       version,
+		Tag:       tag,
 	}
 
 	dockerService, err := docker.New(project, dockerImage, cCtx.String(dockerFileNameFlag))
@@ -79,13 +88,17 @@ func (c *CLI) init(cCtx *cli.Context) {
 	c.DockerService = dockerService
 	c.dockerImage = dockerImage
 	c.project = project
+	return nil
 }
 
-func (c *CLI) getProject(cCtx *cli.Context) *project.Project {
+func (c *CLI) getProject(cCtx *cli.Context) (*project.Project, error) {
 	if (c.project == project.Project{}) {
-		c.init(cCtx)
+		err := c.init(cCtx)
+		if err != nil {
+			return nil, err
+		}
 	}
-	return &c.project
+	return &c.project, nil
 }
 
 func (c CLI) Run(args []string) error {

diff --git a/src/cli/delete.go b/src/cli/delete.go
@@ -14,7 +14,10 @@ func (c *CLI) Delete(cCtx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	project := c.getProject(cCtx)
+	project, err := c.getProject(cCtx)
+	if err != nil {
+		return err
+	}
 	return knative.Clean(cCtx.String(namespaceFlag), config, project)
 }
 

diff --git a/src/cli/deploy.go b/src/cli/deploy.go
@@ -15,7 +15,10 @@ func (c *CLI) Deploy(cCtx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	project := c.getProject(cCtx)
+	project, err := c.getProject(cCtx)
+	if err != nil {
+		return err
+	}
 
 	return knative.Apply(cCtx.String(namespaceFlag), config, project, c.dockerImage)
 }

diff --git a/src/cli/onbranch.go b/src/cli/onbranch.go
@@ -80,7 +80,6 @@ func (c CLI) OnBranchCMD() *cli.Command {
 			}
 
 			branchName := head.Name().Short()
-			c.Logger.Infof("Using branch %v as version and namespace", branchName)
 
 			ctx.Set(appVersionFlag, utils.EncodeRFC1123(branchName))
 			ctx.Set(namespaceFlag, utils.EncodeRFC1123(branchName))

diff --git a/src/cli/template.go b/src/cli/template.go
@@ -7,7 +7,10 @@ import (
 )
 
 func (c *CLI) template(cCtx *cli.Context) error {
-	project := c.getProject(cCtx)
+	project, err := c.getProject(cCtx)
+	if err != nil {
+		return err
+	}
 	content, err := project.Dockerfile()
 	if err != nil {
 		return fmt.Errorf("Getting docker file %v", err)