Skip to content

Commit

Permalink
fix convoluted,faulty version check
Browse files Browse the repository at this point in the history
  • Loading branch information
ggessner committed Jan 9, 2023
1 parent d7630cf commit ffd9a4f
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions internal/docker/docker_checks.go
Expand Up @@ -36,18 +36,18 @@ func CheckDockerConfig() (DockerComposeVersion, error) {
}

// ckeck for docker-compose (v1) version
dockerComposeV1Cmd := exec.Command("docker-compose", "-v")
_, errV1 := dockerComposeV1Cmd.Output()
dockerComposeCmd := exec.Command("docker-compose", "-v")
_, err = dockerComposeCmd.Output()
if err == nil {
return ComposeV1, nil
}

// ckeck for docker-compose (V2) version
dockerComposeV2Cmd := exec.Command("docker compose", "version")
_, errV2 := dockerComposeV2Cmd.Output()

if errV1 == nil && errV2 != nil {
return ComposeV1, nil
} else if errV1 != nil && errV2 == nil {
dockerComposeCmd = exec.Command("docker compose", "version")
_, err = dockerComposeCmd.Output()
if err == nil {
return ComposeV2, nil
} else {
return None, fmt.Errorf("an error occurred while running docker-compose. Is docker-compose installed on your computer?")
}

return None, fmt.Errorf("an error occurred while running docker-compose. Is docker-compose installed on your computer?")
}

0 comments on commit ffd9a4f

Please sign in to comment.