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

Copy dockerfile.dockerignore if it exists when copying Dockerfile (#1607)

This commit is contained in:
Chris Hoffman 2021-04-14 11:02:24 -05:00 committed by GitHub
parent 6028f1c5ec
commit ac1fc88081
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,6 +261,12 @@ func copyDockerfile() error {
if _, err := util.CopyFile(opts.DockerfilePath, constants.DockerfilePath, util.FileContext{}, util.DoNotChangeUID, util.DoNotChangeGID); err != nil { if _, err := util.CopyFile(opts.DockerfilePath, constants.DockerfilePath, util.FileContext{}, util.DoNotChangeUID, util.DoNotChangeGID); err != nil {
return errors.Wrap(err, "copying dockerfile") return errors.Wrap(err, "copying dockerfile")
} }
dockerignorePath := opts.DockerfilePath + ".dockerignore"
if util.FilepathExists(dockerignorePath) {
if _, err := util.CopyFile(dockerignorePath, constants.DockerfilePath+".dockerignore", util.FileContext{}, util.DoNotChangeUID, util.DoNotChangeGID); err != nil {
return errors.Wrap(err, "copying Dockerfile.dockerignore")
}
}
opts.DockerfilePath = constants.DockerfilePath opts.DockerfilePath = constants.DockerfilePath
return nil return nil
} }