Merge "Git-Daemon bump to 2.39.3 and container image based on UBI 8"

softwarefactory-project · Nov 17, 2023 · c44b966 · c44b966
2 parents 97086b0 + 3d8fb90
commit c44b966
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/controllers/git_server.go b/controllers/git_server.go
@@ -66,6 +66,7 @@ func (r *SFController) DeployGitServer() bool {
 
 	annotations := map[string]string{
 		"system-config": utils.Checksum([]byte(preInitScript)),
+		"image":         base.GitServerImage,
 	}
 
 	if r.isConfigRepoSet() {

diff --git a/controllers/libs/base/images.go b/controllers/libs/base/images.go
@@ -21,7 +21,7 @@ const (
 var (
 	BusyboxImage          = ImageToString(Image{Path: "quay.io/software-factory/sf-op-busybox", Version: "1.5-3"})
 	GerritImage           = ImageToString(Image{Path: "quay.io/software-factory/gerrit", Version: "3.6.4-8"})
-	GitServerImage        = ImageToString(Image{Path: "quay.io/software-factory/git-deamon", Version: "2.39.1-3"})
+	GitServerImage        = ImageToString(Image{Path: "quay.io/software-factory/git-deamon", Version: "2.39.3-1"})
 	SSHDImage             = ImageToString(Image{Path: "quay.io/software-factory/sshd", Version: "0.1-3"})
 	PurgeLogsImage        = ImageToString(Image{Path: "quay.io/software-factory/purgelogs", Version: "0.2.3-3"})
 	NodepoolLauncherImage = ImageToString(Image{Path: "quay.io/software-factory/nodepool-launcher", Version: nodepoolImageVersion})