From f6395ff8746a0dfbe23e355c6f7d5d13de9a04d2 Mon Sep 17 00:00:00 2001
From: Michael Wintermeyer <mswintermeyer@users.noreply.github.com>
Date: Wed, 29 Mar 2023 07:57:12 -0400
Subject: [PATCH] Use docker compose v2 by default (#729)

Enable docker-compose v2 by default, since it's present in internal and external circle
---
 changelog/@unreleased/pr-729.v2.yml                          | 5 +++++
 .../compose/RemoveConflictingContainersIntegrationTest.java  | 2 +-
 .../com/palantir/docker/compose/DockerComposeManager.java    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelog/@unreleased/pr-729.v2.yml

diff --git a/changelog/@unreleased/pr-729.v2.yml b/changelog/@unreleased/pr-729.v2.yml
new file mode 100644
index 000000000..139cd7dcb
--- /dev/null
+++ 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/docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java b/docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java
index de0546c8b..7bad17c51 100644
--- a/docker-compose-rule-core/src/integrationTest/java/com/palantir/docker/compose/RemoveConflictingContainersIntegrationTest.java
+++ b/docker-compose-rule-core/src/integrationTest/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
index d9bd7ffb1..76c0ee4f7 100644
--- 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