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

update initialWhitelist instead of whitelist

This commit is contained in:
Tejal Desai 2020-02-04 10:55:07 -08:00
parent bd59b60f02
commit 2e95c3040c
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/util/fs_util.go
View File

@ -817,7 +817,8 @@ func UpdateWhitelist(whitelistVarRun bool) {
if !whitelistVarRun { if !whitelistVarRun {
return return
} }
whitelist = append(initialWhitelist, WhitelistEntry{ logrus.Trace("Adding /var/run to initialWhitelist ")
initialWhitelist = append(initialWhitelist, WhitelistEntry{
// /var/run is a special case. It's common to mount in /var/run/docker.sock or something similar // /var/run is a special case. It's common to mount in /var/run/docker.sock or something similar
// which leads to a special mount on the /var/run/docker.sock file itself, but the directory to exist // which leads to a special mount on the /var/run/docker.sock file itself, but the directory to exist
// in the image with no way to tell if it came from the base image or not. // in the image with no way to tell if it came from the base image or not.

16
pkg/util/fs_util_test.go
View File

@ -1305,22 +1305,16 @@ func TestUpdateWhitelist(t *testing.T) {
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
whitelist = initialWhitelist original := initialWhitelist
defer func() { whitelist = initialWhitelist }() defer func() { initialWhitelist = original }()
sort.Slice(tt.expected, func(i, j int) bool {
return tt.expected[i].Path < tt.expected[j].Path
})
sort.Slice(whitelist, func(i, j int) bool {
return whitelist[i].Path < whitelist[j].Path
})
UpdateWhitelist(tt.whitelistVarRun) UpdateWhitelist(tt.whitelistVarRun)
sort.Slice(tt.expected, func(i, j int) bool { sort.Slice(tt.expected, func(i, j int) bool {
return tt.expected[i].Path < tt.expected[j].Path return tt.expected[i].Path < tt.expected[j].Path
}) })
sort.Slice(whitelist, func(i, j int) bool { sort.Slice(initialWhitelist, func(i, j int) bool {
return whitelist[i].Path < whitelist[j].Path return initialWhitelist[i].Path < initialWhitelist[j].Path
}) })
testutil.CheckDeepEqual(t, tt.expected, whitelist) testutil.CheckDeepEqual(t, tt.expected, initialWhitelist)
}) })
} }
} }