tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #81 from chris-crone/always-context 

Context should always be handled by new CLI
This commit is contained in:
Guillaume Tardif 2020-05-13 09:40:28 +02:00 committed by GitHub
parent 4e7645aae2 c93d2e9180
commit 1a3365fa37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/main.go
View File

@ -51,6 +51,10 @@ import (
"github.com/docker/api/util" "github.com/docker/api/util"
) )
var (
runningOwnCommand bool
)
type mainOpts struct { type mainOpts struct {
apicontext.Flags apicontext.Flags
debug bool debug bool
@ -86,7 +90,8 @@ func main() {
SilenceErrors: true, SilenceErrors: true,
SilenceUsage: true, SilenceUsage: true,
PersistentPreRunE: func(cmd *cobra.Command, args []string) error { PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
if !isOwnCommand(cmd) { runningOwnCommand = isOwnCommand(cmd)
if !runningOwnCommand {
execMoby(cmd.Context()) execMoby(cmd.Context())
} }
return nil return nil
@ -108,7 +113,8 @@ func main() {
helpFunc := root.HelpFunc() helpFunc := root.HelpFunc()
root.SetHelpFunc(func(cmd *cobra.Command, args []string) { root.SetHelpFunc(func(cmd *cobra.Command, args []string) {
if !isOwnCommand(cmd) { runningOwnCommand = isOwnCommand(cmd)
if !runningOwnCommand {
execMoby(cmd.Context()) execMoby(cmd.Context())
} }
helpFunc(cmd, args) helpFunc(cmd, args)
@ -150,6 +156,11 @@ func main() {
ctx = store.WithContextStore(ctx, s) ctx = store.WithContextStore(ctx, s)
if err = root.ExecuteContext(ctx); err != nil { if err = root.ExecuteContext(ctx); err != nil {
// Context should always be handled by new CLI
if runningOwnCommand {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
execMoby(ctx) execMoby(ctx)
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)