Merge pull request #730 from tonistiigi/no-cache-fix

AkihiroSuda · web-flow · commit 8cf9bec86a7f · 2018-11-21T12:35:10.000+09:00
buildctl: fix frontends ignore-cache setting
diff --git a/cmd/buildctl/build.go b/cmd/buildctl/build.go
@@ -218,7 +218,9 @@ func build(clicontext *cli.Context) error {
 			return err
 		}
 	} else {
-		solveOpt.FrontendAttrs["no-cache"] = ""
+		if clicontext.Bool("no-cache") {
+			solveOpt.FrontendAttrs["no-cache"] = ""
+		}
 	}
 
 	if clicontext.String("frontend") != "" && len(clicontext.StringSlice("import-cache")) != 0 {

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,9 @@ func build(clicontext *cli.Context) error {`
`218`	`218`	`return err`
`219`	`219`	`}`
`220`	`220`	`} else {`
`221`		`- solveOpt.FrontendAttrs["no-cache"] = ""`
	`221`	`+ if clicontext.Bool("no-cache") {`
	`222`	`+ solveOpt.FrontendAttrs["no-cache"] = ""`
	`223`	`+ }`
`222`	`224`	`}`
`223`	`225`
`224`	`226`	`if clicontext.String("frontend") != "" && len(clicontext.StringSlice("import-cache")) != 0 {`