From 5361edde998e98a10a9196b2056bf428761562d2 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Wed, 24 Jul 2024 12:33:24 -0700 Subject: [PATCH] Use docker-compose from nix instead of "docker compose" Avoids segfault running "docker compose" with latest docker version --- dev/healthcheck.py | 3 +-- prelude-si/tilt.bzl | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dev/healthcheck.py b/dev/healthcheck.py index 3e63b78997..e89ef07bca 100755 --- a/dev/healthcheck.py +++ b/dev/healthcheck.py @@ -62,8 +62,7 @@ def detect_docker_engine() -> int: def detect_docker_compose() -> int: result = subprocess.run( [ - "docker", - "compose", + "docker-compose", "version", ], capture_output=True, diff --git a/prelude-si/tilt.bzl b/prelude-si/tilt.bzl index 9bde2c182a..e4939e72d6 100644 --- a/prelude-si/tilt.bzl +++ b/prelude-si/tilt.bzl @@ -51,8 +51,7 @@ def tilt_docker_compose_pull_impl(ctx: AnalysisContext) -> list[[DefaultInfo, Ru ) run_cmd_args = cmd_args([ - "docker", - "compose", + "docker-compose", "--file", docker_compose_file, "pull", @@ -88,8 +87,7 @@ def tilt_docker_compose_stop_impl(ctx: AnalysisContext) -> list[[DefaultInfo, Ru ) run_cmd_args = cmd_args([ - "docker", - "compose", + "docker-compose", "--file", docker_compose_file, "stop",