Fix resolution of Dockerfile relative dockerignore #1607
Conversation
cmd/executor/cmd/root.go
Outdated
| @@ -223,6 +223,7 @@ func resolveDockerfilePath() error { | |||
| return errors.Wrap(err, "getting absolute path for dockerfile") | |||
| } | |||
| opts.DockerfilePath = abs | |||
| opts.OriginalDockerfilePath = abs | |||
There was a problem hiding this comment.
Is there a difference between OriginalDockerfilePath and DockerfilePath?
There was a problem hiding this comment.
Yes because the line immediately following in copyDockerFile
kaniko/cmd/executor/cmd/root.go
Line 257 in 0477900
There was a problem hiding this comment.
Sorry @cehoffman for the delayed response. The L257 code makes sure, we fall back to Dockerfile if the file passed in command line arg --dockerfile does not exist.
If we fallback to Dockerfile then the dockerfile ignore should also be Dockerfile.dockerignore right?
There was a problem hiding this comment.
L257 I believe is to make the Dockerfile used for build always ends up at /kaniko/Dockerfile. I see now I didn’t modify the the context local Dockerfile lookup on L235
I think perhaps the right solution is to extend copyDockerfile() to detect a relative dockerignore and copy it to /kaniko/Dockerfile.dockerignore. That would then let the existing lookup resolve and not require the OriginalDockerfilePath struct item.
Fixes #1451
Description
Docker ships with buildkit enabled by default now enabling Dockerfile
specific dockerignore resolution, e.g. Dockerfile.dockerignore.
This functionality was added in #801, but not enabled in integration tests
because the standard docker build did not support this style of ignore.
I'm not sure where to add the integration test because the existing dockerfile
does an adequate job for validating the fix. Also I'm completely open to
changing the name of the new opts value from
OriginalDockerfilePath.Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.
Reviewer Notes
Release Notes