Report ignorefile location when no content added #3576
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@aramcap PTAL |
| @@ -110,6 +110,7 @@ symlink(subdir)" | |||
| @test "bud with .dockerignore #2" { | |||
| run_buildah 125 build -t testbud3 --signature-policy ${TESTSDIR}/policy.json ${TESTSDIR}/bud/dockerignore3 | |||
| expect_output --substring 'error building.*"COPY test1.txt /upload/test1.txt".*no such file or directory' | |||
There was a problem hiding this comment.
Test is failing as it can't find the file test1.txt
add.go
Outdated
| if _, err := os.Stat(ignoreFile); err != nil { | ||
| ignoreFile = "" | ||
| } | ||
| } |
There was a problem hiding this comment.
This guess could well be wrong if buildah add's --ignorefile flag is used.
There was a problem hiding this comment.
There is no way to know at this level whether that happened. I would figure most likely, their would not have been an ignorefile.
There was a problem hiding this comment.
Pass the filename that's the source of the Excludes list in as a field in the AddAndCopyOptions, and if one is provided, include it in the error message?
rhatdan
changed the title
rhatdan
force-pushed
the
errors
branch
3 times, most recently
from
308054a
to
916a01a
Compare
pkg/parse/parse.go
Outdated
| } | ||
| return "" | ||
| } | ||
| func ContainerIgnoreFile(path string, contextDir string) ([]string, string, error) { |
There was a problem hiding this comment.
The arguments here are in the reverse of the order in which I think its callers expect.
|
All kinds of test unhappiness @rhatdan |
Users have accidently had a .containerignore or .dockerignore file in their context directly which blocked all content. Currently we report that no globs matched, but do not identify where the globs came from. This change is an attempt to add this data to the error. Example: containers#3318 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
|
LGTM |
|
LGTM |
Users have accidently had a .containerignore or .dockerignore
file in their context directly which blocked all content.
Currently we report that no globs matched, but do not
identify where the globs came from.
This change is an attempt to add this data to the error.
Example: #3318
Signed-off-by: Daniel J Walsh dwalsh@redhat.com
What type of PR is this?
What this PR does / why we need it:
How to verify it
Which issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?