Fix docker compose

mysteriumnetwork · Aug 14, 2024 · d93013b · d93013b
1 parent a83caff
commit d93013b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ci/test/testinstall/install_integration_test.go b/ci/test/testinstall/install_integration_test.go
@@ -49,6 +49,7 @@ func TestInstall(t *testing.T) {
 		"ubuntu-focal",
 		"ubuntu-impish",
 		"ubuntu-jammy",
+		"ubuntu-noble",
 	}
 	for _, img := range images {
 		t.Run(img, func(t *testing.T) {

diff --git a/e2e/runner.go b/e2e/runner.go
@@ -42,8 +42,8 @@ func NewRunner(composeFiles []string, testEnv, services string) (runner *Runner,
 	args = append(args, "-p", testEnv)
 
 	runner = &Runner{
-		compose:    sh.RunCmd("docker-compose", args...),
-		composeOut: sh.OutCmd("docker-compose", args...),
+		compose:    sh.RunCmd("docker", append([]string{"compose"}, args...)...),
+		composeOut: sh.OutCmd("docker", append([]string{"compose"}, args...)...),
 		testEnv:    testEnv,
 		services:   services,
 	}

diff --git a/localnet/localnet.go b/localnet/localnet.go
@@ -21,9 +21,10 @@ import (
 	"time"
 
 	"github.com/magefile/mage/sh"
-	"github.com/mysteriumnetwork/node/logconfig"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
+
+	"github.com/mysteriumnetwork/node/logconfig"
 )
 
 const composeFile = "./docker-compose.localnet.yml"
@@ -61,7 +62,7 @@ func newRunner(composeFiles ...string) *runner {
 	args = append(args, "-p", envName)
 
 	return &runner{
-		compose: sh.RunCmd("docker-compose", args...),
+		compose: sh.RunCmd("docker", append([]string{"compose"}, args...)...),
 		envName: envName,
 	}
 }