Skip to content

Prioritise docker compose v2 #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EnriqueL8 merged 2 commits into from
Jun 17, 2024
Merged

Prioritise docker compose v2 #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5762a8
Prioritise docker compose v2
EnriqueL8 Jun 13, 2024
0038c76
Use latest CLI in E2E test
EnriqueL8 Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ jobs:
- name: Run E2E tests
working-directory: firefly
env:
DOWNLOAD_CLI: false
TEST_SUITE: ${{ matrix.test-suite }}
STACK_TYPE: ${{ matrix.stack-type }}
BLOCKCHAIN_CONNECTOR: ${{ matrix.blockchain-connector }}
Expand Down
12 changes: 6 additions & 6 deletions internal/docker/docker_checks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ func CheckDockerConfig() (DockerComposeVersion, error) {
return None, fmt.Errorf("an error occurred while running docker. Is docker running on your computer?")
}

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

// check for docker-compose (V2) version
dockerComposeCmd = exec.Command("docker", "compose", "version")
// check for docker-compose (v1) version
dockerComposeCmd = exec.Command("docker-compose", "-v")
_, err = dockerComposeCmd.Output()
if err == nil {
return ComposeV2, nil
return ComposeV1, nil
}

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