Use docker compose v2 by default (#729)

Enable docker-compose v2 by default, since it's present in internal and external circle
palantir · Mar 29, 2023 · f6395ff · f6395ff
1 parent 93f7cb9
commit f6395ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/changelog/@unreleased/pr-729.v2.yml b/changelog/@unreleased/pr-729.v2.yml
@@ -0,0 +1,5 @@
+type: break
+break:
+  description: Enable docker-compose v2 by default
+  links:
+  - https://github.com/palantir/docker-compose-rule/pull/729
diff --git a/...tionTest/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java b/...tionTest/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java
@@ -46,7 +46,7 @@ public void removeConflictingContainersOnStartup_off_should_fail_fast_if_contain
         try {
             composition.before();
             exception.expect(DockerExecutionException.class);
-            exception.expectMessage("'docker-compose up -d' returned exit code");
+            exception.expectMessage("'docker compose up -d' returned exit code");
             conflictingComposition.before();
         } finally {
             composition.after();

diff --git a/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/DockerComposeManager.java b/docker-compose-rule-core/src/main/java/com/palantir/docker/compose/DockerComposeManager.java
@@ -107,7 +107,7 @@ public DockerComposeExecutable dockerComposeExecutable() {
 
     @Value.Default
     public boolean useDockerComposeV2() {
-        return false;
+        return true;
     }
 
     @Value.Default