From e7d56e9149c180d32d5207842af2f602b3a210d5 Mon Sep 17 00:00:00 2001 From: Roberto Dip Date: Fri, 2 Aug 2024 15:51:43 -0300 Subject: [PATCH] fix docker compose detection in fleetctl preview (#21006) for https://github.com/fleetdm/fleet/issues/21007 CI that uses this is passing now https://github.com/fleetdm/fleet/actions/runs/10220076886/job/28279696099 # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. - [x] Manual QA for all new/changed functionality --- changes/21006-fleetctl-preview | 1 + cmd/fleetctl/preview.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/21006-fleetctl-preview diff --git a/changes/21006-fleetctl-preview b/changes/21006-fleetctl-preview new file mode 100644 index 0000000000..9fe2fd3286 --- /dev/null +++ b/changes/21006-fleetctl-preview @@ -0,0 +1 @@ +* Fixed a bug in `fleetctl preview` that was causing it to fail if Docker was installed without support for the deprecated `docker-compose` CLI diff --git a/cmd/fleetctl/preview.go b/cmd/fleetctl/preview.go index a48734871c..1aa78695f9 100644 --- a/cmd/fleetctl/preview.go +++ b/cmd/fleetctl/preview.go @@ -74,7 +74,7 @@ func (d dockerCompose) Command(arg ...string) *exec.Cmd { func newDockerCompose() (dockerCompose, error) { // first, check if `docker compose` is available - if err := exec.Command("docker compose").Run(); err == nil { + if err := exec.Command("docker", "compose").Run(); err == nil { return dockerCompose{dockerComposeV2}, nil }