Support multi-dir wildcards in .dockerignore by duglin · Pull Request #17090 · moby/moby

duglin · 2015-10-15T21:56:22Z

This adds support for wildcarding multiple levels of dirs in .dockerignore files.
** (or **/) means zero or more dirs.
So **/*.go will exclude all go files from the build context.

Signed-off-by: Doug Davis dug@us.ibm.com

thaJeztah · 2015-10-15T22:54:42Z

Tests are failing :/

duglin · 2015-10-16T02:45:03Z

windows failure is real so please don't merge yet.... need debugging help from @jhowardmsft

duglin · 2015-10-16T17:46:54Z

@jhowardmsft I think I got it working but I don't have a lot of confidence that its very stable. Please look over the escaping bits to see if any of it makes sense.

tiborvass · 2015-10-16T22:16:54Z

I'm +1 for this to align with gitignore.

vdemeester · 2015-10-16T22:29:26Z

I'm 😻 for it too 😉

duglin · 2015-10-17T00:28:26Z

https://git-scm.com/docs/gitignore
hmmm, close but not quite what I implemented - will look at the missing /** case.
So please don't merge quite yet.

duglin · 2015-10-20T02:16:06Z

While its not quite the exact same as .gitignore, its pretty close. Please take a look when you get a chance.

ping @tiborvass @vdemeester @jhowardmsft

thaJeztah · 2015-10-20T03:25:14Z

would be cool if we could test this against the tests in git itself, e.g. https://github.com/git/git/blob/8d530c4d64ffcc853889f7b385f554d53db375ed/t/t0008-ignores.sh

duglin · 2015-10-20T12:21:24Z

@thaJeztah its not 100% compatible with git's stuff so I wouldn't be surprised if it failed. This is mainly because I believe git's logic takes into account whether we're talking about a file or a dir, and we don't have that information at this spot in the code. We might be able to redesign things so that we do, but that's a much bigger change since it leaves the boundaries of the Match() function and would impact things like the tar/archive logic. I can explore that option if people want....

thaJeztah · 2015-10-20T14:32:22Z

@duglin nah, it's cool. Any change that makes .dockerignore act more like .gitignore is good, so I'm happy with this PR, we can evolve later if we want to.

vdemeester · 2015-10-20T15:15:37Z

Repeating myself but looks good, and the tests too 😻. Agree with @thaJeztah too, so :
Design LGTM for me.

duglin · 2015-10-27T16:40:02Z

ok - added more integration tests so once Janky does its stuff we should be good to go.
I'll squash it once janky runs too.

duglin · 2015-10-29T11:37:29Z

Failures on exp. & userns are unrelated.
ping @jfrazelle @tiborvass @vdemeester for review.
ping @jhowardmsft to make sure there isn't anything Windows specific I need to think about.

vincentbernat · 2015-10-29T12:23:21Z

I suppose you meant @vdemeester instead of me.

duglin · 2015-10-29T12:25:17Z

@vincentbernat LOL oops, sorry. yes @vdemeester

duglin · 2015-11-08T19:25:33Z

ping @jfrazelle @tiborvass @vdemeester

vdemeester · 2015-11-08T21:50:11Z

I'll take the +1 of @tiborvass and the "nah, it's cool. Any change that makes .dockerignore act more like .gitignore is good" from @thaJeztah as Design LGTMs and moving this to code review 😉

LK4D4 · 2015-11-13T21:37:24Z

pkg/fileutils/fileutils.go

forgotten debug?

LOL yes and no. I left it there because I kept having to uncomment it as I was testing windows.
If all reviews are ok then I'll remove this.

LK4D4 · 2015-11-13T21:39:15Z

LGTM apart from suspicious comment

Closes moby#13113 Signed-off-by: Doug Davis <dug@us.ibm.com>

duglin · 2015-11-13T21:44:28Z

remove extra comment - per @LK4D4's comment

Support multi-dir wildcards in .dockerignore

GordonTheTurtle added the status/0-triage label Oct 15, 2015

duglin force-pushed the dockerignoreWildcards branch 2 times, most recently from 97939f2 to ffdabb8 Compare October 15, 2015 21:58

duglin mentioned this pull request Oct 15, 2015

Ignore file extension in all folders with .dockerignore #13113

Closed

thaJeztah added status/1-design-review and removed status/0-triage labels Oct 15, 2015

duglin force-pushed the dockerignoreWildcards branch 4 times, most recently from f90b822 to 192d307 Compare October 16, 2015 02:41

duglin force-pushed the dockerignoreWildcards branch 2 times, most recently from eb176c5 to 8990eb9 Compare October 16, 2015 16:22

duglin force-pushed the dockerignoreWildcards branch from afaf2dd to 85e6386 Compare October 20, 2015 00:02

duglin force-pushed the dockerignoreWildcards branch from 85e6386 to 90f3d6d Compare October 27, 2015 14:27

duglin force-pushed the dockerignoreWildcards branch 4 times, most recently from 77976e0 to dd4983f Compare October 29, 2015 01:23

duglin force-pushed the dockerignoreWildcards branch from dd4983f to 7324b51 Compare October 29, 2015 02:16

vdemeester added status/2-code-review and removed status/1-design-review labels Nov 8, 2015

LK4D4 reviewed Nov 13, 2015
View reviewed changes

Support multi-dir wildcards in .dockerignore

eddb14a

Closes moby#13113 Signed-off-by: Doug Davis <dug@us.ibm.com>

duglin force-pushed the dockerignoreWildcards branch from 7324b51 to eddb14a Compare November 13, 2015 21:44

LK4D4 added a commit that referenced this pull request Nov 13, 2015

Merge pull request #17090 from duglin/dockerignoreWildcards

f5e318a

Support multi-dir wildcards in .dockerignore

LK4D4 merged commit f5e318a into moby:master Nov 13, 2015

thaJeztah added the impact/changelog label Nov 14, 2015

thaJeztah added this to the 1.10 milestone Nov 14, 2015

duglin deleted the dockerignoreWildcards branch February 19, 2016 19:29

sroze mentioned this pull request Mar 5, 2016

Update the Docker configuration api-platform/api-platform#47

Merged

kutyel mentioned this pull request Jul 18, 2016

Ignore git repo in all subfolders Tecnativa/docker-ocb#1

Merged

jmarver mentioned this pull request Jan 6, 2017

rpc error: code = 2 desc = "containerd: container did not start before the specified timeout" Shippable/support#3265

Closed

Lothiraldan mentioned this pull request Jan 31, 2017

Support multi-dir wildcards in .dockerignore docker/docker-py#1430

Closed

camilamacedo86 mentioned this pull request Mar 17, 2021

🐛 fix: ignore non-go files during Docker build kubernetes-sigs/kubebuilder#2081

Merged

Conversation

duglin commented Oct 15, 2015

Uh oh!

thaJeztah commented Oct 15, 2015

Uh oh!

duglin commented Oct 16, 2015

Uh oh!

duglin commented Oct 16, 2015

Uh oh!

tiborvass commented Oct 16, 2015

Uh oh!

vdemeester commented Oct 16, 2015

Uh oh!

duglin commented Oct 17, 2015

Uh oh!

duglin commented Oct 20, 2015

Uh oh!

thaJeztah commented Oct 20, 2015

Uh oh!

duglin commented Oct 20, 2015

Uh oh!

thaJeztah commented Oct 20, 2015

Uh oh!

vdemeester commented Oct 20, 2015

Uh oh!

duglin commented Oct 27, 2015

Uh oh!

duglin commented Oct 29, 2015

Uh oh!

vincentbernat commented Oct 29, 2015

Uh oh!

duglin commented Oct 29, 2015

Uh oh!

duglin commented Nov 8, 2015

Uh oh!

vdemeester commented Nov 8, 2015

Uh oh!

LK4D4 Nov 13, 2015

Choose a reason for hiding this comment

Uh oh!

duglin Nov 13, 2015

Choose a reason for hiding this comment

Uh oh!

LK4D4 commented Nov 13, 2015

Uh oh!

duglin commented Nov 13, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants