浏览代码

Simplify command setup

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 4 年之前
父节点
当前提交
8259604074
共有 1 个文件被更改,包括 1 次插入16 次删除
  1. 1 16
      cli/cmd/compose/run.go

+ 1 - 16
cli/cmd/compose/run.go

@@ -20,10 +20,8 @@ import (
 	"context"
 	"context"
 	"fmt"
 	"fmt"
 
 
-	"github.com/compose-spec/compose-go/cli"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra"
 
 
-	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/api/containers"
 	"github.com/docker/compose-cli/progress"
 	"github.com/docker/compose-cli/progress"
@@ -69,24 +67,11 @@ func runRun(ctx context.Context, opts runOptions) error {
 		WorkingDir:  opts.WorkingDir,
 		WorkingDir:  opts.WorkingDir,
 		Environment: opts.Environment,
 		Environment: opts.Environment,
 	}
 	}
-	options, err := projectOpts.toProjectOptions()
-	if err != nil {
-		return err
-	}
-	project, err := cli.ProjectFromOptions(options)
-	if err != nil {
-		return err
-	}
-
-	err = filter(project, []string{opts.Name})
+	c, project, err := setup(ctx, projectOpts, []string{opts.Name})
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
 
 
-	c, err := client.NewWithDefaultLocalBackend(ctx)
-	if err != nil {
-		return err
-	}
 	containerID, err := progress.Run(ctx, func(ctx context.Context) (string, error) {
 	containerID, err := progress.Run(ctx, func(ctx context.Context) (string, error) {
 		return c.ComposeService().CreateOneOffContainer(ctx, project, compose.RunOptions{
 		return c.ComposeService().CreateOneOffContainer(ctx, project, compose.RunOptions{
 			Name:    opts.Name,
 			Name:    opts.Name,