Merge pull request #307 from hyperledger/prioritise_docker_composev2

Prioritise docker compose v2
hyperledger · Jun 17, 2024 · 10122f8 · 10122f8
2 parents 9c8b5dd + 0038c76
commit 10122f8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -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 }}

diff --git a/internal/docker/docker_checks.go b/internal/docker/docker_checks.go
@@ -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?")