Skip to content

Commit

Permalink
[FIX] Correct always using docker compose, even if it not compatible.
Browse files Browse the repository at this point in the history
  • Loading branch information
josep-tecnativa committed Apr 10, 2024
1 parent e2bc946 commit 4008588
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions tasks_downstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"""
import json
import os
import shutil
import stat
import subprocess
import tempfile
import time
from datetime import datetime
Expand Down Expand Up @@ -46,9 +46,14 @@
"build"
]["args"]["ODOO_VERSION"]
)
DOCKER_COMPOSE_CMD = f"{shutil.which('docker')} compose" or shutil.which(
"docker-compose"

docker_compose_result = subprocess.run(
[which("docker"), "compose"], capture_output=True, text=True
)
if docker_compose_result.returncode == 0:
DOCKER_COMPOSE_CMD = "docker compose"
else:
DOCKER_COMPOSE_CMD = "docker-compose"

_logger = getLogger(__name__)

Expand Down

0 comments on commit 4008588

Please sign in to comment.