diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go index c5b27e49e..825b893bc 100644 --- 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 index 93bb37e0d..5755e5eed 100644 --- 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 index 7bdd6a6e1..4d4cfffbb 100644 --- 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 {