Skip to content

Commit

Permalink
chore(ci): try to fix docker compose
Browse files Browse the repository at this point in the history
Signed-off-by: Evgeniy Frolov <[email protected]>
  • Loading branch information
Fral738 committed Dec 9, 2024
1 parent eb8d5b6 commit 7cdf7bc
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions e2e/tests/client/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)
Expand Down Expand Up @@ -111,7 +111,7 @@ var _ = SynchronizedAfterSuite(

testutil.RunSucceedCommand(
"",
"docker-compose",
"docker compose",
"--project-directory", fixturesDir,
"down",
)
Expand Down
10 changes: 5 additions & 5 deletions e2e/tests/flow/complete_cycle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,27 +142,27 @@ var _ = Describe("Complete cycle", func() {
composeUpMinio := func() {
testutil.RunSucceedCommand(
testDir,
"docker-compose",
"docker compose",
"up", "--detach",
)
}

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)
Expand All @@ -172,7 +172,7 @@ var _ = Describe("Complete cycle", func() {
composeDownMinio := func() {
testutil.RunSucceedCommand(
testDir,
"docker-compose",
"docker compose",
"down",
)
}
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/flow/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down

0 comments on commit 7cdf7bc

Please sign in to comment.