From 370781e95e9c06d0bc2c46f5bc3f64c873b24f02 Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@gmail.com>
Date: Mon, 14 Dec 2020 17:21:16 +0100
Subject: [PATCH] =?UTF-8?q?Support=20option=20=E2=80=94workingdir,=20-f,?=
 =?UTF-8?q?=20no=20need=20to=20check=20backend=20support,=20unimplemented?=
 =?UTF-8?q?=20error=20is=20returned=20by=20backbends.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
---
 cli/cmd/compose/run.go | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/cli/cmd/compose/run.go b/cli/cmd/compose/run.go
index 8623edf70..a7bd4fac7 100644
--- a/cli/cmd/compose/run.go
+++ b/cli/cmd/compose/run.go
@@ -26,8 +26,6 @@ import (
 	"github.com/docker/compose-cli/api/client"
 	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/compose-cli/api/containers"
-	apicontext "github.com/docker/compose-cli/context"
-	"github.com/docker/compose-cli/context/store"
 	"github.com/docker/compose-cli/progress"
 )
 
@@ -35,6 +33,7 @@ type runOptions struct {
 	Name        string
 	Command     []string
 	WorkingDir  string
+	ConfigPaths []string
 	Environment []string
 	Detach      bool
 	Publish     []string
@@ -51,17 +50,6 @@ func runCommand() *cobra.Command {
 		Short: "Run a one-off command on a service.",
 		Args:  cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			s := store.ContextStore(cmd.Context())
-			currentCtx, err := s.Get(apicontext.CurrentContext(cmd.Context()))
-			if err != nil {
-				return err
-			}
-			switch currentCtx.Type() {
-			case store.DefaultContextType:
-			default:
-				return fmt.Errorf(`Command "run" is not yet implemented for %q context type`, currentCtx.Type())
-			}
-
 			if len(args) > 1 {
 				opts.Command = args[1:]
 			}
@@ -70,7 +58,7 @@ func runCommand() *cobra.Command {
 		},
 	}
 	runCmd.Flags().StringVar(&opts.WorkingDir, "workdir", "", "Work dir")
-
+	runCmd.Flags().StringArrayVarP(&opts.ConfigPaths, "file", "f", []string{}, "Compose configuration files")
 	runCmd.Flags().StringArrayVarP(&opts.Publish, "publish", "p", []string{}, "Publish a container's port(s). [HOST_PORT:]CONTAINER_PORT")
 	runCmd.Flags().StringVar(&opts.Name, "name", "", "Assign a name to the container")
 	runCmd.Flags().BoolVar(&opts.NoDeps, "no-deps", false, "Don't start linked services.")
@@ -85,10 +73,11 @@ func runCommand() *cobra.Command {
 }
 
 func runRun(ctx context.Context, opts runOptions) error {
-	// target service
-	services := []string{opts.Name}
-
-	projectOpts := composeOptions{}
+	projectOpts := composeOptions{
+		ConfigPaths: opts.ConfigPaths,
+		WorkingDir:  opts.WorkingDir,
+		Environment: opts.Environment,
+	}
 	options, err := projectOpts.toProjectOptions()
 	if err != nil {
 		return err
@@ -98,7 +87,7 @@ func runRun(ctx context.Context, opts runOptions) error {
 		return err
 	}
 
-	err = filter(project, services)
+	err = filter(project, []string{opts.Name})
 	if err != nil {
 		return err
 	}