Merge pull request #224 from covexo/issue-218

resolve #218

Author: FabianKramm

cmd/init.go

@@ -7,6 +7,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/covexo/devspace/pkg/devspace/clients/kubectl"
+
+	"github.com/covexo/devspace/pkg/devspace/builder/docker"
+
 	"github.com/covexo/devspace/pkg/devspace/config/configutil"
 	"github.com/covexo/devspace/pkg/devspace/generator"
 	"github.com/covexo/devspace/pkg/util/log"
@@ -421,10 +425,31 @@ func (cmd *InitCmd) configureKubernetes() {
 }
 
 func (cmd *InitCmd) configureRegistry() {
+	dockerUsername := ""
+	createInternalRegistryDefaultAnswer := "yes"
+
+	var imageBuilder *docker.Builder
+	var dockerBuilderErr error
+
+	imageBuilder, dockerBuilderErr = docker.NewBuilder("", "", "", false)
+
+	if dockerBuilderErr == nil {
+		log.StartWait("Checking Docker credentials")
+		dockerAuthConfig, dockerAuthErr := imageBuilder.Authenticate("", "", true)
+		log.StopWait()
+
+		if dockerAuthErr == nil {
+			dockerUsername = dockerAuthConfig.Username
+
+			if dockerUsername != "" {
+				createInternalRegistryDefaultAnswer = "no"
+			}
+		}
+	}
 	internalRegistryConfig := cmd.config.Services.InternalRegistry
 	createInternalRegistry := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 		Question:               "Should we create a private registry within your Kubernetes cluster for you? (yes | no)",
-		DefaultValue:           "yes",
+		DefaultValue:           createInternalRegistryDefaultAnswer,
 		ValidationRegexPattern: "^(yes)|(no)$",
 	})
 
@@ -437,22 +462,77 @@ func (cmd *InitCmd) configureRegistry() {
 
 		cmd.defaultRegistry.URL = registryURL
 		internalRegistryConfig = nil
+		loginWarningServer := ""
+
+		if dockerUsername == "" {
+			if *registryURL != "hub.docker.com" {
+				loginWarningServer = " " + *registryURL
+				imageBuilder, dockerBuilderErr = docker.NewBuilder(*registryURL, "", "", false)
+			}
+
+			if dockerBuilderErr == nil {
+				log.StartWait("Checking Docker credentials")
+				dockerAuthConfig, dockerAuthErr := imageBuilder.Authenticate("", "", true)
+				log.StopWait()
+
+				if dockerAuthErr == nil {
+					dockerUsername = dockerAuthConfig.Username
+				}
+			}
+		}
+
+		if dockerUsername == "" {
+			if cmd.defaultImage.Build.Engine.Docker != nil {
+				log.Fatal("Make sure you login to the registry with: docker login" + loginWarningServer)
+			} else {
+				registryMapOverwrite := *cmd.overwriteConfig.Registries
+				defaultRegistryOverwrite, defaultRegistryOverwriteDefined := registryMapOverwrite["default"]
+
+				if !defaultRegistryOverwriteDefined {
+					defaultRegistryOverwrite = &v1.RegistryConfig{}
+					registryMapOverwrite["default"] = defaultRegistryOverwrite
+				}
+
+				if defaultRegistryOverwrite.Auth == nil {
+					defaultRegistryOverwrite.Auth = &v1.RegistryAuth{}
+				}
+
+				if defaultRegistryOverwrite.Auth.Username == nil {
+					defaultRegistryOverwrite.Auth.Username = configutil.String("")
+				}
+
+				defaultRegistryOverwrite.Auth.Username = stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+					Question:               "Which username do you want to use to push images to " + *registryURL + "?",
+					DefaultValue:           *defaultRegistryOverwrite.Auth.Username,
+					ValidationRegexPattern: "^[a-zA-Z0-9]{4,30}$",
+				})
+				dockerUsername = *defaultRegistryOverwrite.Auth.Username
+
+				if defaultRegistryOverwrite.Auth.Password == nil {
+					defaultRegistryOverwrite.Auth.Password = configutil.String("")
+				}
+
+				defaultRegistryOverwrite.Auth.Username = stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+					Question:               "Which password do you want to use to push images to " + *registryURL + "?",
+					DefaultValue:           *defaultRegistryOverwrite.Auth.Password,
+					ValidationRegexPattern: "^.*$",
+				})
+			}
+		}
 
 		if *registryURL == "hub.docker.com" {
 			defaultImageName := *cmd.defaultImage.Name
 			defaultImageNameParts := strings.Split(defaultImageName, "/")
-			existingDockerUsername := ""
 
-			if len(defaultImageNameParts) > 1 {
-				existingDockerUsername = defaultImageNameParts[0]
+			if len(defaultImageNameParts) < 2 {
+				defaultImageName = dockerUsername + "/" + strings.TrimPrefix(defaultImageName, dockerUsername)
 			}
 
-			dockerUsername := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-				Question:               "What is your Docker username?",
-				DefaultValue:           existingDockerUsername,
+			cmd.defaultImage.Name = stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+				Question:               "Which image name do you want to use on Docker Hub?",
+				DefaultValue:           defaultImageName,
 				ValidationRegexPattern: "^[a-zA-Z0-9]{4,30}$",
 			})
-			cmd.defaultImage.Name = configutil.String(*dockerUsername + "/" + strings.TrimPrefix(defaultImageName, *dockerUsername))
 		}
 	} else {
 		imageMap := *cmd.config.Images
@@ -537,6 +617,8 @@ func (cmd *InitCmd) configureRegistry() {
 						},
 					},
 				}
+			} else if kubectl.IsMinikube() == false {
+				log.Warn("Your Kubernetes cluster will not be able to pull images from a registry without a registry domain!\n")
 			}
 		}
 		secrets, registryHasSecrets := registryReleaseValues["secrets"]

pkg/devspace/builder/docker/client.go

@@ -2,20 +2,20 @@ package docker
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"os/exec"
 	"path/filepath"
 	"strings"
 
+	"github.com/covexo/devspace/pkg/devspace/clients/kubectl"
+
 	"github.com/docker/docker/api"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/tlsconfig"
-	"k8s.io/client-go/tools/clientcmd"
 )
 
-var isMinikubeVar *bool
-
 func newDockerClientFromEnvironment() (client.CommonAPIClient, error) {
 	cli, err := client.NewClientWithOpts(client.FromEnv)
 	if err != nil {
@@ -27,6 +27,10 @@ func newDockerClientFromEnvironment() (client.CommonAPIClient, error) {
 }
 
 func newDockerClientFromMinikube() (client.CommonAPIClient, error) {
+	if kubectl.IsMinikube() == false {
+		return nil, errors.New("Cluster is not a minikube cluster")
+	}
+
 	env, err := getMinikubeEnvironment()
 	if err != nil {
 		return nil, err
@@ -65,23 +69,6 @@ func newDockerClientFromMinikube() (client.CommonAPIClient, error) {
 	return client.NewClient(host, version, httpclient, nil)
 }
 
-func isMinikube() bool {
-	if isMinikubeVar == nil {
-		loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
-		kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{})
-		cfg, err := kubeConfig.RawConfig()
-
-		if err != nil {
-			return false
-		}
-
-		isMinikube := cfg.CurrentContext == "minikube"
-		isMinikubeVar = &isMinikube
-	}
-
-	return *isMinikubeVar
-}
-
 func getMinikubeEnvironment() (map[string]string, error) {
 	cmd := exec.Command("minikube", "docker-env", "--shell", "none")
 	out, err := cmd.Output()

pkg/devspace/clients/kubectl/client.go

@@ -16,6 +16,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/portforward"
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/client-go/transport/spdy"
@@ -28,6 +29,8 @@ import (
 	"k8s.io/kubernetes/pkg/util/node"
 )
 
+var isMinikubeVar *bool
+
 //NewClient creates a new kubernetes client
 func NewClient() (*kubernetes.Clientset, error) {
 	config, err := GetClientConfig()
@@ -39,6 +42,24 @@ func NewClient() (*kubernetes.Clientset, error) {
 	return kubernetes.NewForConfig(config)
 }
 
+// IsMinikube returns true if the Kubernetes cluster is a minikube
+func IsMinikube() bool {
+	if isMinikubeVar == nil {
+		loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
+		kubeConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loadingRules, &clientcmd.ConfigOverrides{})
+		cfg, err := kubeConfig.RawConfig()
+
+		if err != nil {
+			return false
+		}
+
+		isMinikube := cfg.CurrentContext == "minikube"
+		isMinikubeVar = &isMinikube
+	}
+
+	return *isMinikubeVar
+}
+
 // GetFirstRunningPod retrieves the first pod that is found that has the status "Running" using the label selector string
 func GetFirstRunningPod(kubectl *kubernetes.Clientset, labelSelector, namespace string) (*k8sv1.Pod, error) {
 	podList, err := kubectl.Core().Pods(namespace).List(metav1.ListOptions{