feat: use registry version from local config (#428)

swiftwave-org · Mar 24, 2024 · a053af1 · a053af1
1 parent 4404ccd
commit a053af1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/swiftwave_service/cmd/init.go b/swiftwave_service/cmd/init.go
@@ -89,6 +89,7 @@ var initCmd = &cobra.Command{
 		currentPostgresTimeZone := ""
 		currentPostgresSSLMode := ""
 
+		currentLocalImageRegistryImage := ""
 		currentLocalImageRegistryPort := 0
 		currentLocalImageRegistryUser := ""
 		currentLocalImageRegistryPassword := ""
@@ -101,6 +102,7 @@ var initCmd = &cobra.Command{
 			currentPostgresDatabase = config.LocalConfig.PostgresqlConfig.Database
 			currentPostgresTimeZone = config.LocalConfig.PostgresqlConfig.TimeZone
 			currentPostgresSSLMode = config.LocalConfig.PostgresqlConfig.SSLMode
+			currentLocalImageRegistryImage = config.LocalConfig.LocalImageRegistryConfig.Image
 			currentLocalImageRegistryPort = config.LocalConfig.LocalImageRegistryConfig.Port
 			currentLocalImageRegistryUser = config.LocalConfig.LocalImageRegistryConfig.Username
 			currentLocalImageRegistryPassword = config.LocalConfig.LocalImageRegistryConfig.Password
@@ -125,6 +127,7 @@ var initCmd = &cobra.Command{
 				RunLocalPostgres: isLocalPostgres,
 			},
 			LocalImageRegistryConfig: local_config.LocalImageRegistryConfig{
+				Image:    defaultString(currentLocalImageRegistryImage, "registry:2.8"),
 				Port:     defaultInt(currentLocalImageRegistryPort, 3334),
 				Username: defaultString(currentLocalImageRegistryUser, "user_"+generateRandomString(8)),
 				Password: defaultString(currentLocalImageRegistryPassword, generateRandomString(20)),

diff --git a/swiftwave_service/cmd/localregistry.go b/swiftwave_service/cmd/localregistry.go
@@ -140,7 +140,7 @@ func startLocalRegistry(ctx context.Context) error {
 				"-v", fmt.Sprintf("%s:/cert", config.LocalConfig.LocalImageRegistryConfig.CertPath),
 				"-v", fmt.Sprintf("%s:/auth", config.LocalConfig.LocalImageRegistryConfig.AuthPath),
 				"-v", fmt.Sprintf("%s:/var/lib/registry", config.LocalConfig.LocalImageRegistryConfig.DataPath),
-				"--name", localRegistryContainerName, "registry:2.8")
+				"--name", localRegistryContainerName, config.LocalConfig.LocalImageRegistryConfig.Image)
 		} else {
 			printInfo("Using Non-TLS for local image registry")
 			dockerCmd = exec.Command("docker", "run", "-d",
@@ -151,7 +151,7 @@ func startLocalRegistry(ctx context.Context) error {
 				"-e", "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm",
 				"-v", fmt.Sprintf("%s:/auth", config.LocalConfig.LocalImageRegistryConfig.AuthPath),
 				"-v", fmt.Sprintf("%s:/var/lib/registry", config.LocalConfig.LocalImageRegistryConfig.DataPath),
-				"--name", localRegistryContainerName, "registry:2.8")
+				"--name", localRegistryContainerName, config.LocalConfig.LocalImageRegistryConfig.Image)
 		}
 		dockerCmd.Stdout = os.Stdout
 		dockerCmd.Stderr = os.Stderr

diff --git a/swiftwave_service/config/local_config/types.go b/swiftwave_service/config/local_config/types.go
@@ -58,6 +58,7 @@ type LocalImageRegistryConfig struct {
 	Port     int    `yaml:"port"`
 	Username string `yaml:"username"`
 	Password string `yaml:"password"`
+	Image    string `yaml:"image"`
 	DataPath string `yaml:"-"`
 	CertPath string `yaml:"-"`
 	AuthPath string `yaml:"-"`

diff --git a/swiftwave_service/config/local_config/utils.go b/swiftwave_service/config/local_config/utils.go
@@ -7,6 +7,7 @@ import (
 	"gopkg.in/yaml.v3"
 	"io"
 	"os"
+	"strings"
 )
 
 var config *Config
@@ -85,13 +86,13 @@ func readConfigFile(path string) (*Config, error) {
 }
 
 func FillDefaults(config *Config) error {
-	if config.ServiceConfig.BindAddress == "" {
+	if strings.Compare(config.ServiceConfig.BindAddress, "") == 0 {
 		config.ServiceConfig.BindAddress = defaultBindAddress
 	}
 	if config.ServiceConfig.BindPort == 0 {
 		config.ServiceConfig.BindPort = defaultBindPort
 	}
-	if config.ServiceConfig.ManagementNodeAddress == "" {
+	if strings.Compare(config.ServiceConfig.ManagementNodeAddress, "") == 0 {
 		return errors.New("management_node_address is required in config")
 	}
 	if config.LocalImageRegistryConfig.Port == 0 {