Merge pull request #115 from AkihiroSuda/trace

buildctl: allow specifying trace file path
docker-18.09
Tõnis Tiigi 2017-09-07 09:04:47 -07:00 committed by GitHub
commit a0abecfab7
1 changed files with 12 additions and 1 deletions

View File

@ -33,6 +33,10 @@ var buildCommand = cli.Command{
Name: "no-progress", Name: "no-progress",
Usage: "Don't show interactive progress", Usage: "Don't show interactive progress",
}, },
cli.StringFlag{
Name: "trace",
Usage: "Path to trace file. e.g. /dev/null. Defaults to /tmp/buildctlXXXXXXXXX.",
},
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "local", Name: "local",
Usage: "Allow build access to the local directory", Usage: "Allow build access to the local directory",
@ -48,13 +52,20 @@ var buildCommand = cli.Command{
}, },
} }
func openTraceFile(clicontext *cli.Context) (*os.File, error) {
if traceFileName := clicontext.String("trace"); traceFileName != "" {
return os.OpenFile(traceFileName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
}
return ioutil.TempFile("", "buildctl")
}
func build(clicontext *cli.Context) error { func build(clicontext *cli.Context) error {
c, err := resolveClient(clicontext) c, err := resolveClient(clicontext)
if err != nil { if err != nil {
return err return err
} }
traceFile, err := ioutil.TempFile("", "buildctl") traceFile, err := openTraceFile(clicontext)
if err != nil { if err != nil {
return err return err
} }