Merge pull request #296 from covexo/private-registry

Fix issue with private registries

Author: FabianKramm

pkg/devspace/image/build.go

@@ -176,6 +176,10 @@ func Build(client *kubernetes.Clientset, generatedConfig *generated.Config, imag
 		log.Info("Image pushed to registry (" + displayRegistryURL + ")")
 
 		// Update config
+		if registryURL != "" {
+			imageName = registryURL + "/" + imageName
+		}
+
 		generatedConfig.ImageTags[imageName] = imageTag
 
 		log.Done("Done building and pushing image '" + imageName + "'")

pkg/devspace/registry/registry.go

@@ -135,24 +135,30 @@ func waitForRegistry(registryNamespace, registryReleaseDeploymentName string, cl
 // GetImageURL returns the image (optional with tag)
 func GetImageURL(generatedConfig *generated.Config, imageConfig *v1.ImageConfig, includingLatestTag bool) string {
 	image := *imageConfig.Name
+	registryURL := ""
 
 	if imageConfig.Registry != nil {
 		registryConfig, registryConfErr := GetRegistryConfig(imageConfig)
 		if registryConfErr != nil {
 			log.Fatal(registryConfErr)
 		}
 
-		registryURL := *registryConfig.URL
+		registryURL = *registryConfig.URL
 		if registryURL != "" && registryURL != "hub.docker.com" {
 			image = registryURL + "/" + image
 		}
 	}
 
+	fullImageName := *imageConfig.Name
+	if registryURL != "" {
+		fullImageName = registryURL + "/" + fullImageName
+	}
+
 	if includingLatestTag {
 		if imageConfig.Tag != nil {
 			image = image + ":" + *imageConfig.Tag
 		} else {
-			image = image + ":" + generatedConfig.ImageTags[*imageConfig.Name]
+			image = image + ":" + generatedConfig.ImageTags[fullImageName]
 		}
 	}