From 52c5759fc46bca11063c9723823a46c4d7345815 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Mon, 16 Apr 2018 11:08:40 -0700 Subject: [PATCH] create list of build files --- pkg/constants/constants.go | 8 +++----- pkg/util/fs_util.go | 6 ++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index 5755e5eed..1c036b53a 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -29,11 +29,6 @@ const ( //KanikoDir is the path to the Kaniko directory KanikoDir = "/kaniko" - // 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" Author = "kaniko" @@ -52,3 +47,6 @@ const ( // NoBaseImage is the scratch image NoBaseImage = "scratch" ) + +// KanikoBuildFiles is the list of files required to build kaniko +var KanikoBuildFiles = []string{"/kaniko/executor", "/kaniko/ssl/certs/ca-certificates.crt"} diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go index 4d4cfffbb..3c25a1878 100644 --- a/pkg/util/fs_util.go +++ b/pkg/util/fs_util.go @@ -57,8 +57,10 @@ func ExtractFileSystemFromImage(img string) error { // PathInWhitelist returns true if the path is whitelisted func PathInWhitelist(path, directory string) bool { - if path == constants.KanikoExecutor || path == constants.KanikoCerts { - return false + for _, c := range constants.KanikoBuildFiles { + if path == c { + return false + } } for _, d := range whitelist { dirPath := filepath.Join(directory, d)