|
78 | 78 | # ```
|
79 | 79 | # To support docker-compose
|
80 | 80 | 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"] |
82 | 82 |
|
83 | 83 |
|
84 | 84 | class NaturalOrderGroup(typer.core.TyperGroup):
|
@@ -204,7 +204,7 @@ def destroy():
|
204 | 204 | with _gen_docker_compose(DEFAULT_MODULES) as docker_compose_fn:
|
205 | 205 | os.execvpe(
|
206 | 206 | "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"], |
208 | 208 | _make_env({}),
|
209 | 209 | )
|
210 | 210 |
|
@@ -270,7 +270,7 @@ def prepare_environment(
|
270 | 270 | typer.secho("Running docker compose to create containers", fg=c.GREEN)
|
271 | 271 | with _gen_docker_compose(modules, diracx_dist_dir=diracx_dist_dir) as docker_compose_fn:
|
272 | 272 | 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"] |
274 | 274 | + extra_services,
|
275 | 275 | check=True,
|
276 | 276 | env=docker_compose_env,
|
@@ -377,7 +377,7 @@ def prepare_environment(
|
377 | 377 | subStderr = open(docker_compose_fn_final / "stderr", "w")
|
378 | 378 |
|
379 | 379 | 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"], |
381 | 381 | env=docker_compose_env,
|
382 | 382 | stdin=None,
|
383 | 383 | stdout=subStdout,
|
@@ -645,7 +645,7 @@ def _gen_docker_compose(modules, *, diracx_dist_dir=None):
|
645 | 645 | def _check_containers_running(*, is_up=True):
|
646 | 646 | with _gen_docker_compose(DEFAULT_MODULES) as docker_compose_fn:
|
647 | 647 | 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"], |
649 | 649 | stdout=subprocess.PIPE,
|
650 | 650 | env=_make_env({}),
|
651 | 651 | # docker compose ps has a non-zero exit code when no containers are running
|
|
0 commit comments