Skip to content

Commit 03d4906

Browse files
author
Robin VAN DE MERGHEL
committed
fix: Small fix (forgot to change to docker**compose)
1 parent 020fb93 commit 03d4906

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

integration_tests.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
# ```
7979
# To support docker-compose
8080
IS_OSX = os.getenv("OSX")
81-
DOCKER_COMPOSE_CMD = "docker-compose" if IS_OSX else "docker"
81+
DOCKER_COMPOSE_CMD = ["docker-compose"] if IS_OSX else ["docker", "compose"]
8282

8383

8484
class NaturalOrderGroup(typer.core.TyperGroup):
@@ -204,7 +204,7 @@ def destroy():
204204
with _gen_docker_compose(DEFAULT_MODULES) as docker_compose_fn:
205205
os.execvpe(
206206
"docker",
207-
[DOCKER_COMPOSE_CMD, "-f", docker_compose_fn, "down", "--remove-orphans", "-t", "0", "--volumes"],
207+
[*DOCKER_COMPOSE_CMD, "-f", docker_compose_fn, "down", "--remove-orphans", "-t", "0", "--volumes"],
208208
_make_env({}),
209209
)
210210

@@ -270,7 +270,7 @@ def prepare_environment(
270270
typer.secho("Running docker compose to create containers", fg=c.GREEN)
271271
with _gen_docker_compose(modules, diracx_dist_dir=diracx_dist_dir) as docker_compose_fn:
272272
subprocess.run(
273-
[DOCKER_COMPOSE_CMD, "-f", docker_compose_fn, "up", "-d", "dirac-server", "dirac-client", "dirac-pilot"]
273+
[*DOCKER_COMPOSE_CMD, "-f", docker_compose_fn, "up", "-d", "dirac-server", "dirac-client", "dirac-pilot"]
274274
+ extra_services,
275275
check=True,
276276
env=docker_compose_env,
@@ -377,7 +377,7 @@ def prepare_environment(
377377
subStderr = open(docker_compose_fn_final / "stderr", "w")
378378

379379
subprocess.Popen(
380-
[DOCKER_COMPOSE_CMD, "-f", docker_compose_fn_final / "docker-compose.yml", "up", "-d", "diracx"],
380+
[*DOCKER_COMPOSE_CMD, "-f", docker_compose_fn_final / "docker-compose.yml", "up", "-d", "diracx"],
381381
env=docker_compose_env,
382382
stdin=None,
383383
stdout=subStdout,
@@ -645,7 +645,7 @@ def _gen_docker_compose(modules, *, diracx_dist_dir=None):
645645
def _check_containers_running(*, is_up=True):
646646
with _gen_docker_compose(DEFAULT_MODULES) as docker_compose_fn:
647647
running_containers = subprocess.run(
648-
[DOCKER_COMPOSE_CMD, "-f", docker_compose_fn, "ps", "-q", "-a"],
648+
[*DOCKER_COMPOSE_CMD, "-f", docker_compose_fn, "ps", "-q", "-a"],
649649
stdout=subprocess.PIPE,
650650
env=_make_env({}),
651651
# docker compose ps has a non-zero exit code when no containers are running

0 commit comments

Comments
 (0)