diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ece0b6f9..912c7f74 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -109,7 +109,8 @@ $toolsList = @( (Get-CMakeVersion), (Get-DockerMobyClientVersion), (Get-DockerMobyServerVersion), - (Get-DockerComposeVersion), + (Get-DockerComposeV1Version), + (Get-DockerComposeV2Version), (Get-DockerBuildxVersion), (Get-GitVersion), (Get-GitLFSVersion), diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 4c641c23..a189d38b 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -63,9 +63,14 @@ function Get-CMakeVersion { return "CMake $cmakeVersion" } -function Get-DockerComposeVersion { +function Get-DockerComposeV1Version { $composeVersion = docker-compose -v | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "," - return "Docker Compose $composeVersion" + return "Docker Compose v1 $composeVersion" +} + +function Get-DockerComposeV2Version { + $composeVersion = docker compose version | Take-OutputPart -Part 3 + return "Docker Compose v2 $composeVersion" } function Get-DockerMobyClientVersion { diff --git a/images/linux/scripts/installers/docker-compose.sh b/images/linux/scripts/installers/docker-compose.sh index d6c8e346..40db139c 100644 --- a/images/linux/scripts/installers/docker-compose.sh +++ b/images/linux/scripts/installers/docker-compose.sh @@ -9,4 +9,4 @@ URL="https://github.com/docker/compose/releases/download/1.29.2/docker-compose-L curl -L $URL -o /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose -invoke_tests "Tools" "Docker-compose" +invoke_tests "Tools" "Docker-compose v1" diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index bb900eb2..57617774 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -16,6 +16,7 @@ if ! IsPackageInstalled $docker_package; then apt-get update apt-get install -y moby-engine moby-cli apt-get install --no-install-recommends -y moby-buildx + apt-get install -y moby-compose else echo "Docker ($docker_package) is already installed" fi diff --git a/images/linux/scripts/tests/Tools.Tests.ps1 b/images/linux/scripts/tests/Tools.Tests.ps1 index fb0e8165..216536ee 100644 --- a/images/linux/scripts/tests/Tools.Tests.ps1 +++ b/images/linux/scripts/tests/Tools.Tests.ps1 @@ -66,6 +66,10 @@ Describe "Docker" { "docker buildx" | Should -ReturnZeroExitCode } + It "docker compose v2" { + "docker compose" | Should -ReturnZeroExitCode + } + Context "docker images" { $testCases = (Get-ToolsetContent).docker.images | ForEach-Object { @{ ImageName = $_ } } @@ -75,7 +79,7 @@ Describe "Docker" { } } -Describe "Docker-compose" { +Describe "Docker-compose v1" { It "docker-compose" { "docker-compose --version"| Should -ReturnZeroExitCode }