mirror of
https://github.com/fleetdm/fleet
synced 2026-05-24 09:28:54 +00:00
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. <!-- Note that API documentation changes are now addressed by the product design team. --> - [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
This commit is contained in:
parent
39a9ec1ad6
commit
e7d56e9149
2 changed files with 2 additions and 1 deletions
1
changes/21006-fleetctl-preview
Normal file
1
changes/21006-fleetctl-preview
Normal file
|
|
@ -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
|
||||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue