logic refactored

gruntwork-io · Jun 20, 2022 · 87ab7bd · 87ab7bd
1 parent ffe6365
commit 87ab7bd
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/modules/docker/docker_compose.go b/modules/docker/docker_compose.go
@@ -40,15 +40,7 @@ func RunDockerComposeE(t testing.TestingT, options *Options, args ...string) (st
 }
 
 func runDockerComposeE(t testing.TestingT, stdout bool, options *Options, args ...string) (string, error) {
-	cmd := shell.Command{
-		Command: "docker-compose",
-		// We append --project-name to ensure containers from multiple different tests using Docker Compose don't end
-		// up in the same project and end up conflicting with each other.
-		Args:       append([]string{"--project-name", strings.ToLower(t.Name())}, args...),
-		WorkingDir: options.WorkingDir,
-		Env:        options.EnvVars,
-		Logger:     options.Logger,
-	}
+	var cmd shell.Command
 
 	dockerComposeVersionCmd := icmd.Command("docker", "compose", "version")
 
@@ -62,6 +54,16 @@ func runDockerComposeE(t testing.TestingT, stdout bool, options *Options, args .
 			Env:        options.EnvVars,
 			Logger:     options.Logger,
 		}
+	} else {
+		cmd = shell.Command{
+			Command: "docker-compose",
+			// We append --project-name to ensure containers from multiple different tests using Docker Compose don't end
+			// up in the same project and end up conflicting with each other.
+			Args:       append([]string{"--project-name", strings.ToLower(t.Name())}, args...),
+			WorkingDir: options.WorkingDir,
+			Env:        options.EnvVars,
+			Logger:     options.Logger,
+		}
 	}
 
 	if stdout {