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 521d64d
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions tasks_downstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import os
import shutil
import stat
import subprocess
import tempfile
import time
from datetime import datetime
Expand Down Expand Up @@ -46,8 +47,17 @@
"build"
]["args"]["ODOO_VERSION"]
)
DOCKER_COMPOSE_CMD = f"{shutil.which('docker')} compose" or shutil.which(
"docker-compose"
# The following lines of code determine the docker dompose command to be used.
# The logic behind this is that if it's a version compatible with cocker compose,
# it will use this; otherwise, it will fallback to using docker-compose instead.
docker_compose_v2 = (
subprocess.run([shutil.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__)
Expand Down

0 comments on commit 521d64d

Please sign in to comment.