Merge branch 'master' of github.com:GoogleContainerTools/kaniko into cache-fix

cmd/executor/cmd/root.go

@@ -20,15 +20,16 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strings"
+	"time"
 
 	"github.com/GoogleContainerTools/kaniko/pkg/buildcontext"
 	"github.com/GoogleContainerTools/kaniko/pkg/config"
 	"github.com/GoogleContainerTools/kaniko/pkg/constants"
-	"github.com/GoogleContainerTools/kaniko/pkg/dockerfile"
 	"github.com/GoogleContainerTools/kaniko/pkg/executor"
+	"github.com/GoogleContainerTools/kaniko/pkg/timing"
 	"github.com/GoogleContainerTools/kaniko/pkg/util"
-	"github.com/docker/docker/pkg/fileutils"
 	"github.com/genuinetools/amicontained/container"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -49,6 +50,7 @@ func init() {
 	addHiddenFlags(RootCmd)
 }
 
+// RootCmd is the kaniko command that is run
 var RootCmd = &cobra.Command{
 	Use: "executor",
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
@@ -67,7 +69,7 @@ var RootCmd = &cobra.Command{
 		if err := resolveDockerfilePath(); err != nil {
 			return errors.Wrap(err, "error resolving dockerfile path")
 		}
-		return removeIgnoredFiles()
+		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
 		if !checkContained() {
@@ -76,6 +78,9 @@ var RootCmd = &cobra.Command{
 			}
 			logrus.Warn("kaniko is being run outside of a container. This can have dangerous effects on your system")
 		}
+		if err := executor.CheckPushPermissions(opts); err != nil {
+			exit(errors.Wrap(err, "error checking push permissions -- make sure you entered the correct tag name, and that you are authenticated correctly, and try again"))
+		}
 		if err := os.Chdir("/"); err != nil {
 			exit(errors.Wrap(err, "error changing to root dir"))
 		}
@@ -86,6 +91,21 @@ var RootCmd = &cobra.Command{
 		if err := executor.DoPush(image, opts); err != nil {
 			exit(errors.Wrap(err, "error pushing image"))
 		}
+
+		benchmarkFile := os.Getenv("BENCHMARK_FILE")
+		// false is a keyword for integration tests to turn off benchmarking
+		if benchmarkFile != "" && benchmarkFile != "false" {
+			f, err := os.Create(benchmarkFile)
+			if err != nil {
+				logrus.Warnf("Unable to create benchmarking file %s: %s", benchmarkFile, err)
+			}
+			defer f.Close()
+			s, err := timing.JSON()
+			if err != nil {
+				logrus.Warnf("Unable to write benchmark file: %s", err)
+			}
+			f.WriteString(s)
+		}
 	},
 }
 
@@ -108,8 +128,12 @@ func addKanikoOptionsFlags(cmd *cobra.Command) {
 	RootCmd.PersistentFlags().BoolVarP(&opts.NoPush, "no-push", "", false, "Do not push the image to the registry")
 	RootCmd.PersistentFlags().StringVarP(&opts.CacheRepo, "cache-repo", "", "", "Specify a repository to use as a cache, otherwise one will be inferred from the destination provided")
 	RootCmd.PersistentFlags().StringVarP(&opts.CacheDir, "cache-dir", "", "/cache", "Specify a local directory to use as a cache.")
+	RootCmd.PersistentFlags().StringVarP(&opts.DigestFile, "digest-file", "", "", "Specify a file to save the digest of the built image to.")
 	RootCmd.PersistentFlags().BoolVarP(&opts.Cache, "cache", "", false, "Use cache when building image")
 	RootCmd.PersistentFlags().BoolVarP(&opts.Cleanup, "cleanup", "", false, "Clean the filesystem at the end")
+	RootCmd.PersistentFlags().DurationVarP(&opts.CacheTTL, "cache-ttl", "", time.Hour*336, "Cache timeout in hours. Defaults to two weeks.")
+	RootCmd.PersistentFlags().VarP(&opts.InsecureRegistries, "insecure-registry", "", "Insecure registry using plain HTTP to push and pull. Set it repeatedly for multiple registries.")
+	RootCmd.PersistentFlags().VarP(&opts.SkipTLSVerifyRegistries, "skip-tls-verify-registry", "", "Insecure registry ignoring TLS verify to push and pull. Set it repeatedly for multiple registries.")
 }
 
 // addHiddenFlags marks certain flags as hidden from the executor help text
@@ -140,6 +164,9 @@ func cacheFlagsValid() error {
 
 // resolveDockerfilePath resolves the Dockerfile path to an absolute path
 func resolveDockerfilePath() error {
+	if match, _ := regexp.MatchString("^https?://", opts.DockerfilePath); match {
+		return nil
+	}
 	if util.FilepathExists(opts.DockerfilePath) {
 		abs, err := filepath.Abs(opts.DockerfilePath)
 		if err != nil {
@@ -163,7 +190,7 @@ func resolveDockerfilePath() error {
 // copy Dockerfile to /kaniko/Dockerfile so that if it's specified in the .dockerignore
 // it won't be copied into the image
 func copyDockerfile() error {
-	if err := util.CopyFile(opts.DockerfilePath, constants.DockerfilePath); err != nil {
+	if _, err := util.CopyFile(opts.DockerfilePath, constants.DockerfilePath, ""); err != nil {
 		return errors.Wrap(err, "copying dockerfile")
 	}
 	opts.DockerfilePath = constants.DockerfilePath
@@ -181,12 +208,12 @@ func resolveSourceContext() error {
 	}
 	if opts.Bucket != "" {
 		if !strings.Contains(opts.Bucket, "://") {
+			// if no prefix use Google Cloud Storage as default for backwards compatibility
 			opts.SrcContext = constants.GCSBuildContextPrefix + opts.Bucket
 		} else {
 			opts.SrcContext = opts.Bucket
 		}
 	}
-	// if no prefix use Google Cloud Storage as default for backwards compatibility
 	contextExecutor, err := buildcontext.GetBuildContext(opts.SrcContext)
 	if err != nil {
 		return err
@@ -200,29 +227,6 @@ func resolveSourceContext() error {
 	return nil
 }
 
-func removeIgnoredFiles() error {
-	if !dockerfile.DockerignoreExists(opts) {
-		return nil
-	}
-	ignore, err := dockerfile.ParseDockerignore(opts)
-	if err != nil {
-		return err
-	}
-	logrus.Infof("Removing ignored files from build context: %s", ignore)
-	files, err := util.RelativeFiles("", opts.SrcContext)
-	if err != nil {
-		return errors.Wrap(err, "getting all files in src context")
-	}
-	for _, f := range files {
-		if rm, _ := fileutils.Matches(f, ignore); rm {
-			if err := os.RemoveAll(f); err != nil {
-				logrus.Errorf("Error removing %s from build context", f)
-			}
-		}
-	}
-	return nil
-}
-
 func exit(err error) {
 	fmt.Println(err)
 	os.Exit(1)