Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace dockerfile/dockerignore with patternmatcher/ignorefile #10922

Merged
merged 3 commits into from
Aug 23, 2023

Conversation

thaJeztah
Copy link
Member

relates to:

go.mod: github.com/moby/patternmatcher v0.6.0

  • integrate frontend/dockerfile/dockerignore from buildkit

full diff: moby/patternmatcher@v0.5.0...v0.6.0

replace dockerfile/dockerignore with patternmatcher/ignorefile

The BuildKit dockerignore package was integrated in the patternmatcher
repository / module. This patch updates our uses of the BuildKit package
with its new location.

A small local change was made to keep the format of the existing error message,
because the "ignorefile" package is slightly more agnostic in that respect
and doesn't include ".dockerignore" in the error message.

What I did

Related issue

(not mandatory) A picture of a cute animal, if possible in relation to what you did

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- integrate frontend/dockerfile/dockerignore from buildkit

full diff: moby/patternmatcher@v0.5.0...v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The BuildKit dockerignore package was integrated in the patternmatcher
repository / module. This patch updates our uses of the BuildKit package
with its new location.

A small local change was made to keep the format of the existing error message,
because the "ignorefile" package is slightly more agnostic in that respect
and doesn't include ".dockerignore" in the error message.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah changed the title eplace dockerfile/dockerignore with patternmatcher/ignorefile replace dockerfile/dockerignore with patternmatcher/ignorefile Aug 22, 2023
@codecov
Copy link

codecov bot commented Aug 22, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.06% ⚠️

Comparison is base (c79f67f) 58.22% compared to head (5d73201) 58.16%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #10922      +/-   ##
==========================================
- Coverage   58.22%   58.16%   -0.06%     
==========================================
  Files         121      121              
  Lines       10693    10697       +4     
==========================================
- Hits         6226     6222       -4     
- Misses       3856     3863       +7     
- Partials      611      612       +1     
Files Changed Coverage Δ
pkg/watch/dockerignore.go 55.68% <0.00%> (-2.66%) ⬇️

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@thaJeztah thaJeztah requested a review from milas August 22, 2023 23:06
Copy link
Contributor

@milas milas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@milas milas merged commit bc9d696 into docker:main Aug 23, 2023
25 checks passed
@thaJeztah thaJeztah deleted the replace_dockerignore branch August 23, 2023 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants