several fixes for up and config + prettify init output

Author: gentele

cmd/init.go

@@ -414,14 +414,31 @@ func (cmd *InitCmd) configureRegistry() {
 			defaultRegistryValue = *cmd.defaultRegistry.URL
 		}
 		registryURL := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-			Question:               "Which registry do you want to push to? (URL or 'internal registry')",
+			Question:               "Which registry do you want to push to? ('internal registry', 'hub.docker.com' or URL)",
 			DefaultValue:           defaultRegistryValue,
 			ValidationRegexPattern: "^.*$",
 		})
 
 		if *registryURL != internalRegistryKey {
 			cmd.defaultRegistry.URL = registryURL
 			internalRegistryConfig = nil
+
+			if *registryURL == "hub.docker.com" {
+				defaultImageName := *cmd.defaultImage.Name
+				defaultImageNameParts := strings.Split(defaultImageName, "/")
+				existingDockerUsername := ""
+
+				if len(defaultImageNameParts) > 1 {
+					existingDockerUsername = defaultImageNameParts[0]
+				}
+
+				dockerUsername := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+					Question:               "What is your Docker username?",
+					DefaultValue:           existingDockerUsername,
+					ValidationRegexPattern: "^[a-zA-Z0-9]{4,30}$",
+				})
+				cmd.defaultImage.Name = configutil.String(*dockerUsername + "/" + strings.TrimPrefix(defaultImageName, *dockerUsername))
+			}
 		} else {
 			imageMap := *cmd.config.Images
 			defaultImageConf, defaultImageExists := imageMap["default"]

cmd/reset.go

@@ -151,6 +151,8 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
 }
 
 func (cmd *ResetCmd) determineResetExtent() {
+	config := configutil.GetConfig(false)
+
 	cmd.flags.deleteDevspaceFolder = true
 	cmd.flags.deleteRelease = true
 
@@ -166,11 +168,13 @@ func (cmd *ResetCmd) determineResetExtent() {
 		ValidationRegexPattern: "^(y|n)$",
 	}) == "y"
 
-	cmd.flags.deleteRegistry = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-		Question:               "Should the docker registry be removed ? (y/n)",
-		DefaultValue:           "y",
-		ValidationRegexPattern: "^(y|n)$",
-	}) == "y"
+	if config.Services.InternalRegistry != nil {
+		cmd.flags.deleteRegistry = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+			Question:               "Should the internal registry be removed ? (y/n)",
+			DefaultValue:           "y",
+			ValidationRegexPattern: "^(y|n)$",
+		}) == "y"
+	}
 
 	cmd.flags.deleteTiller = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 		Question:               "Should the tiller server be removed ? (y/n)",

cmd/status.go

@@ -297,7 +297,7 @@ func getRunningDevSpacePod(helm *helmClient.HelmClientWrapper, client *kubernete
 		return nil, err
 	}
 
-	if len(releases.Releases) == 0 {
+	if releases == nil || len(releases.Releases) == 0 {
 		return nil, errors.New("No release found")
 	}
 

cmd/up.go

@@ -304,24 +304,32 @@ func (cmd *UpCmd) buildImages(buildFlagChanged bool) bool {
 				if imageConf.Build.Engine.Docker.PreferMinikube != nil {
 					preferMinikube = *imageConf.Build.Engine.Docker.PreferMinikube
 				}
-				dockerBuilder, buildErr = docker.NewBuilder(*registryConf.URL, *imageConf.Name, imageTag, preferMinikube)
+				registryURL := *registryConf.URL
+
+				if registryURL == "hub.docker.com" {
+					registryURL = ""
+				}
+				dockerBuilder, buildErr = docker.NewBuilder(registryURL, *imageConf.Name, imageTag, preferMinikube)
 
 				if buildErr == nil {
 					username := ""
 					password := ""
 
-					if registryConf.Auth.Username != nil {
-						username = *registryConf.Auth.Username
-					}
+					if registryConf.Auth != nil {
+						if registryConf.Auth.Username != nil {
+							username = *registryConf.Auth.Username
+						}
 
-					if registryConf.Auth.Password != nil {
-						password = *registryConf.Auth.Password
+						if registryConf.Auth.Password != nil {
+							password = *registryConf.Auth.Password
+						}
 					}
 					log.StartWait("Authenticating (" + *registryConf.URL + ")")
 					buildErr = dockerBuilder.Authenticate(username, password, len(username) == 0)
 					log.StopWait()
 
 					if buildErr == nil {
+						log.Info("Authentication successful (" + *registryConf.URL + ")")
 						buildOptions := &types.ImageBuildOptions{}
 
 						if imageConf.Build.Engine.Docker.Options != nil {
@@ -334,9 +342,15 @@ func (cmd *UpCmd) buildImages(buildFlagChanged bool) bool {
 						log.StopWait()
 
 						if buildErr == nil {
+							log.Info("Image successfully built")
+
 							log.StartWait("Pushing Docker image")
 							buildErr = dockerBuilder.PushImage()
 							log.StopWait()
+
+							if buildErr == nil {
+								log.Info("Image pushed to registry (" + *registryConf.URL + ")")
+							}
 						}
 					}
 				}
@@ -352,6 +366,7 @@ func (cmd *UpCmd) buildImages(buildFlagChanged bool) bool {
 			if err != nil {
 				log.Fatalf("Config saving error: %s", err.Error())
 			}
+			log.Done("Done building and pushing image '" + imageName + "'")
 		} else {
 			log.Infof("Skip building image '%s'", imageName)
 		}
@@ -453,7 +468,7 @@ func (cmd *UpCmd) deployChart() {
 				err = waitForPodReady(cmd.kubectl, cmd.pod, 2*60*time.Second, 5*time.Second)
 
 				if err != nil {
-					log.Panicf("Error during waiting for pod: %s", err.Error())
+					log.Fatalf("Error during waiting for pod: %s", err.Error())
 				}
 
 				break

pkg/devspace/builder/docker/docker.go

@@ -165,6 +165,7 @@ func (b *Builder) Authenticate(user, password string, checkCredentialsStore bool
 	}
 
 	authConfig, err := getDefaultAuthConfig(b.client, checkCredentialsStore, serverAddress, serverAddress == authServer)
+
 	if err != nil || authConfig.Username == "" || authConfig.Password == "" {
 		authConfig.Username = strings.TrimSpace(user)
 		authConfig.Password = strings.TrimSpace(password)

pkg/devspace/clients/helm/client.go

@@ -255,7 +255,7 @@ func ensureTiller(kubectlClient *kubernetes.Clientset, config *v1.Config, upgrad
 			config.DevSpace.Release.Namespace,
 		}
 
-		if config.Services.InternalRegistry.Release.Namespace != nil {
+		if config.Services.InternalRegistry != nil && config.Services.InternalRegistry.Release.Namespace != nil {
 			appNamespaces = append(appNamespaces, config.Services.InternalRegistry.Release.Namespace)
 		}
 		tillerConfig.AppNamespaces = &appNamespaces
@@ -504,13 +504,13 @@ func (helmClientWrapper *HelmClientWrapper) InstallChartByPath(releaseName strin
 			return nil, err
 		}
 		chartDownloader := &helmdownloader.Manager{
-		/*		Out:        i.out,
-				ChartPath:  i.chartPath,
-				HelmHome:   settings.Home,
-				Keyring:    defaultKeyring(),
-				SkipUpdate: false,
-				Getters:    getter.All(settings),
-		*/
+			/*		Out:        i.out,
+					ChartPath:  i.chartPath,
+					HelmHome:   settings.Home,
+					Keyring:    defaultKeyring(),
+					SkipUpdate: false,
+					Getters:    getter.All(settings),
+			*/
 		}
 		err = chartDownloader.Update()
 

pkg/devspace/config/configutil/save.go

@@ -74,6 +74,9 @@ func SaveConfig() error {
 		}
 		return ioutil.WriteFile(workdir+overwriteConfigPath, overwriteConfigYaml, os.ModePerm)
 	}
+	configLoaded = true
+	overwriteConfigLoaded = true
+
 	return nil
 }
 

pkg/devspace/registry/registry.go

@@ -196,7 +196,12 @@ func GetImageURL(imageConfig *v1.ImageConfig, includingLatestTag bool) string {
 	if registryConfErr != nil {
 		log.Fatal(registryConfErr)
 	}
-	image := *registryConfig.URL + "/" + *imageConfig.Name
+	image := *imageConfig.Name
+	registryURL := *registryConfig.URL
+
+	if registryURL != "" && registryURL != "hub.docker.com" {
+		image = registryURL + "/" + image
+	}
 
 	if includingLatestTag {
 		image = image + ":" + *imageConfig.Tag

pkg/util/stdinutil/stdin.go

@@ -7,6 +7,9 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/covexo/devspace/pkg/util/log"
+	"github.com/daviddengcn/go-colortext"
+
 	"github.com/covexo/devspace/pkg/util/paramutil"
 )
 
@@ -47,7 +50,7 @@ func GetFromStdin(params *GetFromStdinParams) *string {
 
 		if len(params.DefaultValue) > 0 {
 			fmt.Print("\n")
-			fmt.Print("Press ENTER to use: " + params.DefaultValue + "")
+			log.WriteColored("Press ENTER to use: "+params.DefaultValue, ct.Green)
 		}
 		fmt.Print("\n")
 
@@ -79,6 +82,8 @@ func GetFromStdin(params *GetFromStdinParams) *string {
 			input = ""
 		}
 	}
+	fmt.Println("")
+
 	return &input
 }