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

Merge pull request #708 from AkihiroSuda/cli-no-cache 

buildctl: support --no-cache for Dockerfile frontend
docker-18.09 dockerfile/0.9.0
Tõnis Tiigi 2018-10-30 10:51:12 -07:00 committed by GitHub
parent 85935a3d1e 7d92f2d6ad
commit 91cd9b4043
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/buildctl/build.go
View File

@ -61,7 +61,7 @@ var buildCommand = cli.Command{
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "no-cache", Name: "no-cache",
Usage: "Disable cache for all the vertices. Frontend is not supported.", Usage: "Disable cache for all the vertices",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "export-cache", Name: "export-cache",
@ -218,9 +218,7 @@ func build(clicontext *cli.Context) error {
return err return err
} }
} else { } else {
if clicontext.Bool("no-cache") { solveOpt.FrontendAttrs["no-cache"] = ""
return errors.New("no-cache is not supported for frontends")
}
} }
eg.Go(func() error { eg.Go(func() error {

8
examples/build-using-dockerfile/main.go
View File

@ -63,6 +63,10 @@ By default, the built image is loaded to Docker.
Name: "target", Name: "target",
Usage: "Set the target build stage to build.", Usage: "Set the target build stage to build.",
}, },
cli.BoolFlag{
Name: "no-cache",
Usage: "Do not use cache when building the image",
},
}, dockerIncompatibleFlags...) }, dockerIncompatibleFlags...)
app.Action = action app.Action = action
if err := app.Run(os.Args); err != nil { if err := app.Run(os.Args); err != nil {
@ -145,7 +149,9 @@ func newSolveOpt(clicontext *cli.Context, w io.WriteCloser) (*client.SolveOpt, e
if target := clicontext.String("target"); target != "" { if target := clicontext.String("target"); target != "" {
frontendAttrs["target"] = target frontendAttrs["target"] = target
} }
if clicontext.Bool("no-cache") {
frontendAttrs["no-cache"] = ""
}
for _, buildArg := range clicontext.StringSlice("build-arg") { for _, buildArg := range clicontext.StringSlice("build-arg") {
kv := strings.SplitN(buildArg, "=", 2) kv := strings.SplitN(buildArg, "=", 2)
if len(kv) != 2 { if len(kv) != 2 {