allow snapshot of kaniko certs so kaniko can build kaniko

hanynowsky · Apr 16, 2018 · c7bcc67 · c7bcc67
1 parent 0ddc211
commit c7bcc67
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go
@@ -100,10 +100,7 @@ func resolveSourceContext() error {
 	if srcContext == "" && bucket == "" {
 		return errors.New("please specify a path to the build context with the --context flag or a GCS bucket with the --bucket flag")
 	}
-	if srcContext != "" && bucket != "" {
-		return errors.New("please specify either --bucket or --context as the desired build context")
-	}
-	if srcContext != "" {
+	if bucket == "" {
 		return nil
 	}
 	logrus.Infof("Using GCS bucket %s as source context", bucket)

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -31,6 +31,8 @@ const (
 
 	// KanikoExecutor is the path to the kaniko executor
 	KanikoExecutor = "/kaniko/executor"
+	// KanikoCerts is the path to the kaniko certs
+	KanikoCerts = "/kaniko/ssl/certs/ca-certificates.crt"
 
 	WhitelistPath = "/proc/self/mountinfo"
 

diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go
@@ -57,7 +57,7 @@ func ExtractFileSystemFromImage(img string) error {
 
 // PathInWhitelist returns true if the path is whitelisted
 func PathInWhitelist(path, directory string) bool {
-	if path == constants.KanikoExecutor {
+	if path == constants.KanikoExecutor || path == constants.KanikoCerts {
 		return false
 	}
 	for _, d := range whitelist {