fix: version compare missing cases (#3581)

Author: sweatybridge

internal/db/start/start.go

@@ -76,7 +76,7 @@ func NewContainerConfig() container.Config {
 			"S3_ACCESS_KEY="+utils.Config.Experimental.S3AccessKey,
 			"S3_SECRET_KEY="+utils.Config.Experimental.S3SecretKey,
 		)
-	} else if config.VersionCompare(utils.Config.Db.Image, "15.8.1.005") < 0 {
+	} else if i := strings.IndexByte(utils.Config.Db.Image, ':'); config.VersionCompare(utils.Config.Db.Image[i+1:], "15.8.1.005") < 0 {
 		env = append(env, "POSTGRES_INITDB_ARGS=--lc-collate=C.UTF-8")
 	}
 	config := container.Config{

pkg/config/config.go

@@ -607,7 +607,7 @@ func (c *config) Load(path string, fsys fs.FS) error {
 	if c.Db.MajorVersion > 14 {
 		if version, err := fs.ReadFile(fsys, builder.PostgresVersionPath); err == nil {
 			// Only replace image if postgres version is above 15.1.0.55
-			if VersionCompare(c.Db.Image, "15.1.0.55") >= 0 {
+			if i := strings.IndexByte(c.Db.Image, ':'); VersionCompare(c.Db.Image[i+1:], "15.1.0.55") >= 0 {
 				c.Db.Image = replaceImageTag(Images.Pg, string(version))
 			}
 		}
@@ -650,11 +650,11 @@ func VersionCompare(a, b string) int {
 	var pA, pB string
 	if vA := strings.Split(a, "."); len(vA) > 3 {
 		a = strings.Join(vA[:3], ".")
-		pA = strings.Join(vA[3:], ".")
+		pA = strings.TrimLeft(strings.Join(vA[3:], "."), "0")
 	}
 	if vB := strings.Split(b, "."); len(vB) > 3 {
 		b = strings.Join(vB[:3], ".")
-		pB = strings.Join(vB[3:], ".")
+		pB = strings.TrimLeft(strings.Join(vB[3:], "."), "0")
 	}
 	if r := semver.Compare("v"+a, "v"+b); r != 0 {
 		return r

pkg/config/config_test.go

@@ -625,6 +625,9 @@ func TestVersionCompare(t *testing.T) {
 		{"15.1.0.55", "15.1.0.55", 0},
 		{"15.8.1.085", "15.1.0.55", 1},
 		{"15.1.0.55", "15.8.1.085", -1},
+		{"17.4.1.005", "17.4.1.005", 0},
+		{"17.4.1.030", "17.4.1.005", 1},
+		{"17.4.1.005", "17.4.1.030", -1},
 		{"15.8.1", "15.8.1", 0},
 		{"17", "15.8", 1},
 		{"14", "15.8", -1},