JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #727 from tonistiigi/add-fix 

dockerfile: avoid urls in context filter
docker-18.09
Tibor Vass 2018-11-20 16:47:31 -08:00 committed by GitHub
parent f2f4b534d4 c840e7967f
commit bf8c057e68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/dockerfile/dockerfile2llb/convert.go
View File

@ -469,9 +469,11 @@ func dispatch(d *dispatchState, cmd command, opt dispatchOpt) error {
err = dispatchCopy(d, c.SourcesAndDest, opt.buildContext, true, c, "", opt) err = dispatchCopy(d, c.SourcesAndDest, opt.buildContext, true, c, "", opt)
if err == nil { if err == nil {
for _, src := range c.Sources() { for _, src := range c.Sources() {
if !strings.HasPrefix(src, "http://") && !strings.HasPrefix(src, "https://") {
d.ctxPaths[path.Join("/", filepath.ToSlash(src))] = struct{}{} d.ctxPaths[path.Join("/", filepath.ToSlash(src))] = struct{}{}
} }
} }
}
case *instructions.LabelCommand: case *instructions.LabelCommand:
err = dispatchLabel(d, c) err = dispatchLabel(d, c)
case *instructions.OnbuildCommand: case *instructions.OnbuildCommand: