From 713bb90c15d650eb8cb82035cbff07999a562663 Mon Sep 17 00:00:00 2001
From: josep-tecnativa <josep.guardiola@tecnativa.com>
Date: Wed, 10 Apr 2024 11:47:22 +0200
Subject: [PATCH]  [FIX] Correct always using docker compose, even if it not
 compatible.

---
 tasks_downstream.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tasks_downstream.py b/tasks_downstream.py
index e8fb7d5f..6c30eb9e 100644
--- a/tasks_downstream.py
+++ b/tasks_downstream.py
@@ -8,6 +8,7 @@
 import os
 import shutil
 import stat
+import subprocess
 import tempfile
 import time
 from datetime import datetime
@@ -46,8 +47,15 @@
         "build"
     ]["args"]["ODOO_VERSION"]
 )
-DOCKER_COMPOSE_CMD = f"{shutil.which('docker')} compose" or shutil.which(
-    "docker-compose"
+
+docker_compose_v2 = (
+    subprocess.run([which("docker"), "compose"], capture_output=True).returncode == 0
+)
+
+DOCKER_COMPOSE_CMD = (
+    f"{shutil.which('docker')} compose"
+    if docker_compose_v2
+    else shutil.which("docker-compose")
 )
 
 _logger = getLogger(__name__)