WIP on fixing docker-compose issues

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Sep 23, 2024 · 4954727 · 4954727
1 parent a2203ec
commit 4954727
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java b/buildSrc/src/main/java/org/opensearch/gradle/docker/DockerSupportService.java
@@ -125,10 +125,7 @@ public DockerAvailability getDockerAvailability() {
                         lastResult = runCommand(dockerPath, "images");
 
                         // If docker all checks out, see if docker-compose is available and working
-                        Optional<String> composePath = getDockerComposePath();
-                        if (lastResult.isSuccess() && composePath.isPresent()) {
-                            isComposeAvailable = runCommand(composePath.get(), "version").isSuccess();
-                        }
+                        isComposeAvailable = runCommand(dockerPath, "compose", "version").isSuccess();
                     }
                 }
             }

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/testfixtures/TestFixturesPlugin.java
@@ -171,7 +171,7 @@ public void execute(Task task) {
                 .findFirst();
 
             composeExtension.getExecutable().set(dockerCompose.isPresent() ? dockerCompose.get() : "/usr/bin/docker");
-            composeExtension.getUseDockerComposeV2().set(false);
+            composeExtension.getUseDockerComposeV2().set(true);
 
             tasks.named("composeUp").configure(t -> {
                 // Avoid running docker-compose tasks in parallel in CI due to some issues on certain Linux distributions

diff --git a/test/fixtures/gcs-fixture/docker-compose.yml b/test/fixtures/gcs-fixture/docker-compose.yml
@@ -1,6 +1,6 @@
-version: '3'
 services:
   gcs-fixture:
+    image: gcs_fixture_image
     build:
       context: .
       args:
@@ -13,6 +13,7 @@ services:
     ports:
       - "80"
   gcs-fixture-third-party:
+    image: gcs_fixture_image
     build:
       context: .
       args:
@@ -25,6 +26,7 @@ services:
     ports:
       - "80"
   gcs-fixture-other:
+    image: gcs_fixture_image
     build:
       context: .
       args:
@@ -37,6 +39,7 @@ services:
     ports:
       - "80"
   gcs-fixture-repositories-metering:
+    image: gcs_fixture_image
     build:
       context: .
       args: