Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Cleanup entrypoint

Browse source 
* use the `fatal` function when we can
* rename moby.ExecRegardlessContext to Exec
This commit is contained in:
Djordje Lukic 2020-06-26 10:23:37 +02:00
parent 4fb039164d
commit 98976e4cb4
2 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cli/mobycli/exec.go
View file

@ -41,7 +41,7 @@ func ExecIfDefaultCtxType(ctx context.Context) {
currentCtx, err := s.Get(currentContext)
// Only run original docker command if the current context is not ours.
if err != nil || mustDelegateToMoby(currentCtx.Type()) {
ExecRegardlessContext(ctx)
Exec(ctx)
}
}
@ -49,8 +49,8 @@ func mustDelegateToMoby(ctxType string) bool {
return ctxType == store.DefaultContextType || ctxType == store.AwsContextType
}
// ExecRegardlessContext delegates to com.docker.cli if on moby context
func ExecRegardlessContext(ctx context.Context) {
// Exec delegates to com.docker.cli if on moby context
func Exec(ctx context.Context) {
cmd := exec.CommandContext(ctx, ComDockerCli, os.Args[1:]...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
@ -65,9 +65,11 @@ func ExecRegardlessContext(ctx context.Context) {
os.Exit(0)
}
// ExecCmd delegates the cli command to com.docker.cli. The error is never returned (process will exit with docker classic exit code), the return type is to make it easier to use with cobra commands
// ExecCmd delegates the cli command to com.docker.cli. The error is never
// returned (process will exit with docker classic exit code), the return type
// is to make it easier to use with cobra commands
func ExecCmd(command *cobra.Command) error {
ExecRegardlessContext(command.Context())
Exec(command.Context())
return nil
}