From 7cdf7bcc21adf7de4213dc8085eee99018be8705 Mon Sep 17 00:00:00 2001 From: Evgeniy Frolov Date: Mon, 9 Dec 2024 12:10:23 +0300 Subject: [PATCH] chore(ci): try to fix docker compose Signed-off-by: Evgeniy Frolov --- e2e/tests/client/suite_test.go | 6 +++--- e2e/tests/flow/complete_cycle_test.go | 10 +++++----- e2e/tests/flow/suite_test.go | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/e2e/tests/client/suite_test.go b/e2e/tests/client/suite_test.go index 3f5e5b4f..998bc4bc 100644 --- a/e2e/tests/client/suite_test.go +++ b/e2e/tests/client/suite_test.go @@ -49,14 +49,14 @@ var _ = SynchronizedBeforeSuite(func() []byte { testutil.RunSucceedCommand( "", - "docker-compose", + "docker compose", "--project-directory", fixturesDir, "up", "--detach", "--build", ) output := testutil.SucceedCommandOutputString( "", - "docker-compose", + "docker compose", "--project-directory", fixturesDir, "port", "server", "8080", ) @@ -111,7 +111,7 @@ var _ = SynchronizedAfterSuite( testutil.RunSucceedCommand( "", - "docker-compose", + "docker compose", "--project-directory", fixturesDir, "down", ) diff --git a/e2e/tests/flow/complete_cycle_test.go b/e2e/tests/flow/complete_cycle_test.go index a57aaee1..a930edbc 100644 --- a/e2e/tests/flow/complete_cycle_test.go +++ b/e2e/tests/flow/complete_cycle_test.go @@ -142,7 +142,7 @@ var _ = Describe("Complete cycle", func() { composeUpMinio := func() { testutil.RunSucceedCommand( testDir, - "docker-compose", + "docker compose", "up", "--detach", ) } @@ -150,19 +150,19 @@ var _ = Describe("Complete cycle", func() { composeAddMinioRepo := func() { testutil.RunSucceedCommand( testDir, - "docker-compose", + "docker compose", "run", "mc", "mb", "main/repo", ) testutil.RunSucceedCommand( testDir, - "docker-compose", + "docker compose", "run", "mc", "policy", "set", "download", "main/repo", ) output := testutil.SucceedCommandOutputString( testDir, - "docker-compose", + "docker compose", "port", "minio", "9000", ) minioAddress = "http://" + strings.TrimSpace(output) @@ -172,7 +172,7 @@ var _ = Describe("Complete cycle", func() { composeDownMinio := func() { testutil.RunSucceedCommand( testDir, - "docker-compose", + "docker compose", "down", ) } diff --git a/e2e/tests/flow/suite_test.go b/e2e/tests/flow/suite_test.go index 82258f10..3c9243ed 100644 --- a/e2e/tests/flow/suite_test.go +++ b/e2e/tests/flow/suite_test.go @@ -14,7 +14,7 @@ import ( ) func Test(t *testing.T) { - testutil.MeetsRequirementTools([]string{"docker", "docker-compose", "git", "git-signatures", "gpg"}) + testutil.MeetsRequirementTools([]string{"docker", "docker compose", "git", "git-signatures", "gpg"}) RegisterFailHandler(Fail) RunSpecs(t, "Flow Suite") }