Merge branch 'master' of https://github.com/covexo/devspace into examples

merge with master

Author: FabianKramm

pkg/devspace/builder/kaniko/kaniko.go

@@ -22,21 +22,23 @@ import (
 
 // Builder holds the necessary information to build and push docker images
 type Builder struct {
-	RegistryURL    string
-	ImageName      string
-	ImageTag       string
-	BuildNamespace string
+	RegistryURL      string
+	ImageName        string
+	ImageTag         string
+	PreviousImageTag string
+	BuildNamespace   string
 
 	allowInsecureRegistry bool
 	kubectl               *kubernetes.Clientset
 }
 
 // NewBuilder creates a new kaniko.Builder instance
-func NewBuilder(registryURL, imageName, imageTag, buildNamespace string, kubectl *kubernetes.Clientset, allowInsecureRegistry bool) (*Builder, error) {
+func NewBuilder(registryURL, imageName, imageTag, lastImageTag, buildNamespace string, kubectl *kubernetes.Clientset, allowInsecureRegistry bool) (*Builder, error) {
 	return &Builder{
 		RegistryURL:           registryURL,
 		ImageName:             imageName,
 		ImageTag:              imageTag,
+		PreviousImageTag:      lastImageTag,
 		BuildNamespace:        buildNamespace,
 		allowInsecureRegistry: allowInsecureRegistry,
 		kubectl:               kubectl,
@@ -85,7 +87,7 @@ func (b *Builder) BuildImage(contextPath, dockerfilePath string, options *types.
 			Containers: []k8sv1.Container{
 				{
 					Name:            "kaniko",
-					Image:           "gcr.io/kaniko-project/executor:debug-60bdda4c49b699f5a21545cc8a050a5f3953223f",
+					Image:           "gcr.io/kaniko-project/executor:debug-5ac29a97734170a0547fea33b348dc7c328e2f8a",
 					ImagePullPolicy: k8sv1.PullIfNotPresent,
 					Command: []string{
 						"/busybox/sleep",
@@ -205,8 +207,12 @@ func (b *Builder) BuildImage(contextPath, dockerfilePath string, options *types.
 			"--single-snapshot",
 		}
 
+		if !options.NoCache {
+			kanikoBuildCmd = append(kanikoBuildCmd, "--cache=true", "--cache-repo="+b.PreviousImageTag)
+		}
+
 		if b.allowInsecureRegistry {
-			kanikoBuildCmd = append(kanikoBuildCmd, "--insecure-skip-tls-verify")
+			kanikoBuildCmd = append(kanikoBuildCmd, "--insecure", "--skip-tls-verify")
 		}
 
 		stdin, stdout, stderr, execErr := kubectl.Exec(b.kubectl, buildPod, buildContainer.Name, kanikoBuildCmd, false, exitChannel)

pkg/devspace/image/build.go

@@ -102,7 +102,7 @@ func Build(client *kubernetes.Clientset, generatedConfig *generated.Config, imag
 				allowInsecurePush = *registryConf.Insecure
 			}
 
-			imageBuilder, err = kaniko.NewBuilder(registryURL, imageName, imageTag, buildNamespace, client, allowInsecurePush)
+			imageBuilder, err = kaniko.NewBuilder(registryURL, imageName, imageTag, (*generatedConfig).ImageTags[imageName], buildNamespace, client, allowInsecurePush)
 			if err != nil {
 				log.Fatalf("Error creating kaniko builder: %v", err)
 			}
@@ -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]
 		}
 	}