Merge branch 'main' into better-migration-ranges

stellar · Sep 4, 2024 · 8c5369d · 8c5369d
2 parents a5bfc3b + b668361
commit 8c5369d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/cmd/soroban-rpc/internal/integrationtest/infrastructure/test.go b/cmd/soroban-rpc/internal/integrationtest/infrastructure/test.go
@@ -468,6 +468,11 @@ func (i *Test) getComposeCommand(args ...string) *exec.Cmd {
 	cmdline = append([]string{"-p", projectName}, cmdline...)
 	cmdline = append(cmdline, args...)
 	cmd := exec.Command("docker-compose", cmdline...)
+	_, err := exec.LookPath("docker-compose")
+	if err != nil {
+		cmdline = append([]string{"compose"}, cmdline...)
+		cmd = exec.Command("docker", cmdline...)
+	}
 
 	if img := os.Getenv("SOROBAN_RPC_INTEGRATION_TESTS_DOCKER_IMG"); img != "" {
 		cmd.Env = append(