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

fix: resolve issue with copy_multistage_test.go and broken ioutil import (#2879)

This commit is contained in:
Aaron Prindle 2023-11-29 10:51:39 -08:00 committed by GitHub
parent 9e595494b6
commit 9e992703e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/executor/copy_multistage_test.go
View File

@ -146,7 +146,7 @@ ENV test test
From scratch as second From scratch as second
COPY --from=first / output/` COPY --from=first / output/`
ioutil.WriteFile(filepath.Join(testDir, "workspace", "Dockerfile"), []byte(dockerFile), 0755) os.WriteFile(filepath.Join(testDir, "workspace", "Dockerfile"), []byte(dockerFile), 0755)
opts := &config.KanikoOptions{ opts := &config.KanikoOptions{
DockerfilePath: filepath.Join(testDir, "workspace", "Dockerfile"), DockerfilePath: filepath.Join(testDir, "workspace", "Dockerfile"),
SrcContext: filepath.Join(testDir, "workspace"), SrcContext: filepath.Join(testDir, "workspace"),
@ -155,13 +155,13 @@ COPY --from=first / output/`
_, err := DoBuild(opts) _, err := DoBuild(opts)
testutil.CheckNoError(t, err) testutil.CheckNoError(t, err)
filesUnderRoot, err := ioutil.ReadDir(filepath.Join(testDir, "output/")) filesUnderRoot, err := os.ReadDir(filepath.Join(testDir, "output/"))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
testutil.CheckDeepEqual(t, 3, len(filesUnderRoot)) testutil.CheckDeepEqual(t, 3, len(filesUnderRoot))
files, err := ioutil.ReadDir(filepath.Join(testDir, "output/workspace/foo")) files, err := os.ReadDir(filepath.Join(testDir, "output/workspace/foo"))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }