public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #94 from priyawadhwa/certs 

Allow snapshot of kaniko certs so kaniko can build kaniko
This commit is contained in:
priyawadhwa 2018-04-16 11:30:17 -07:00 committed by GitHub
parent 51e49d5e14 52c5759fc4
commit 0c327b9d64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/executor/cmd/root.go
View File

@ -100,10 +100,7 @@ func resolveSourceContext() error {
if srcContext == "" && bucket == "" { 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") 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 != "" { if bucket == "" {
return errors.New("please specify either --bucket or --context as the desired build context")
}
if srcContext != "" {
return nil return nil
} }
logrus.Infof("Using GCS bucket %s as source context", bucket) logrus.Infof("Using GCS bucket %s as source context", bucket)

6
pkg/constants/constants.go
View File

@ -29,9 +29,6 @@ const (
//KanikoDir is the path to the Kaniko directory //KanikoDir is the path to the Kaniko directory
KanikoDir = "/kaniko" KanikoDir = "/kaniko"
// KanikoExecutor is the path to the kaniko executor
KanikoExecutor = "/kaniko/executor"
WhitelistPath = "/proc/self/mountinfo" WhitelistPath = "/proc/self/mountinfo"
Author = "kaniko" Author = "kaniko"
@ -50,3 +47,6 @@ const (
// NoBaseImage is the scratch image // NoBaseImage is the scratch image
NoBaseImage = "scratch" NoBaseImage = "scratch"
) )
// KanikoBuildFiles is the list of files required to build kaniko
var KanikoBuildFiles = []string{"/kaniko/executor", "/kaniko/ssl/certs/ca-certificates.crt"}

4
pkg/util/fs_util.go
View File

@ -57,9 +57,11 @@ func ExtractFileSystemFromImage(img string) error {
// PathInWhitelist returns true if the path is whitelisted // PathInWhitelist returns true if the path is whitelisted
func PathInWhitelist(path, directory string) bool { func PathInWhitelist(path, directory string) bool {
if path == constants.KanikoExecutor { for _, c := range constants.KanikoBuildFiles {
if path == c {
return false return false
} }
}
for _, d := range whitelist { for _, d := range whitelist {
dirPath := filepath.Join(directory, d) dirPath := filepath.Join(directory, d)
if pkgutil.HasFilepathPrefix(path, dirPath) { if pkgutil.HasFilepathPrefix(path, dirPath) {