tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 22:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1062 from gtardif/fix_cli_moby_command_detect

Browse Source 
Make Moby command detection (based on help output) more robust.
This commit is contained in:
Nicolas De loof 2020-12-15 12:38:46 +01:00 committed by GitHub
commit 10a19b1159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/mobycli/exec.go
View File

@ -22,7 +22,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
"strings" "regexp"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -112,9 +112,7 @@ func IsDefaultContextCommand(dockerCommand string) bool {
if e != nil { if e != nil {
fmt.Println(e) fmt.Println(e)
} }
output := string(b) return regexp.MustCompile("Usage:\\s*docker\\s*" + dockerCommand).Match(b)
contains := strings.Contains(output, "Usage:\tdocker "+dockerCommand)
return contains
} }
// ExecSilent executes a command and do redirect output to stdOut, return output // ExecSilent executes a command and do redirect output to stdOut, return output