Merge pull request #4224 from systeminit/jkeiser/docker-compose

Use docker-compose from nix instead of "docker compose"
systeminit · Jul 24, 2024 · aaff729 · aaff729
2 parents 0b8a344 + 5361edd
commit aaff729
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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",