Fix internal registry issues

Author: FabianKramm

pkg/devspace/config/configutil/get.go

@@ -68,15 +68,16 @@ func GetConfig() *v1.Config {
 
 		err := loadConfig(configRaw, ConfigPath)
 		if err != nil {
-			log.Fatalf("Unable to load config: %v. Please run `devspace init -r` to correct your config", err)
+			log.Errorf("Loading config: %v", err)
+			log.Fatal("Please run `devspace init -r` to repair your config")
 		}
 
 		//ignore error as overwrite.yaml is optional
 		loadConfig(overwriteConfigRaw, OverwriteConfigPath)
 
 		merge(config, configRaw, unsafe.Pointer(&config), unsafe.Pointer(configRaw))
-		merge(config, overwriteConfig, unsafe.Pointer(&config), unsafe.Pointer(overwriteConfig))
 		merge(overwriteConfig, overwriteConfigRaw, unsafe.Pointer(&overwriteConfig), unsafe.Pointer(overwriteConfigRaw))
+		merge(config, overwriteConfig, unsafe.Pointer(&config), unsafe.Pointer(overwriteConfig))
 
 		if config.DevSpace.Release != nil && config.DevSpace.Release.Namespace == nil {
 			config.DevSpace.Release.Namespace = String("default")

pkg/devspace/configure/registry.go

@@ -188,6 +188,7 @@ func InternalRegistry() error {
 	}
 
 	internalRegistryConfig.Release.Values = &registryReleaseValues
+	config.Registries = &overwriteRegistryMap
 
 	return nil
 }

pkg/devspace/image/build.go

@@ -80,8 +80,6 @@ func Build(client *kubernetes.Clientset, generatedConfig *generated.Config, imag
 				return false, err
 			}
 
-			log.Info(registryURL, *imageConf.Name)
-
 			if len(registryURL) > 0 {
 				// Crop registry Url from imageName
 				imageName = imageName[len(registryURL)+1:]

pkg/devspace/registry/create.go

@@ -88,6 +88,7 @@ func createOrUpdateRegistrySecret(kubectl *kubernetes.Clientset, internalRegistr
 	registryReleaseNamespace := *internalRegistry.Release.Namespace
 
 	registryAuth := registryConfig.Auth
+
 	htpasswdSecretName := registryReleaseName + "-docker-registry-secret"
 	htpasswdSecret, err := kubectl.Core().Secrets(registryReleaseNamespace).Get(htpasswdSecretName, metav1.GetOptions{})
 	if err != nil {

pkg/devspace/registry/registry.go

@@ -148,7 +148,7 @@ func GetImageURL(generatedConfig *generated.Config, imageConfig *v1.ImageConfig,
 		if imageConfig.Tag != nil {
 			image = image + ":" + *imageConfig.Tag
 		} else {
-			image = image + ":" + generatedConfig.ImageTags[image]
+			image = image + ":" + generatedConfig.ImageTags[*imageConfig.Name]
 		}
 	}