diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index 7e819398b..dba8904a3 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -3,6 +3,19 @@ ## Desc: Install Docker Compose. ################################################################################ +Write-Host "Install-Package Docker-Compose v1" +$dockerComposev1Url = "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe" +$checksumsUrl = "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe.sha256" +$dockerComposev1Dir = "C:\ProgramData\docker-compose" +New-Item -Path $dockerComposev1Dir -ItemType Directory +$externalHash = Get-ChecksumFromUrl -Type "SHA256" ` + -Url $checksumsUrl ` + -FileName (Split-Path $dockerComposev1Url -Leaf) +$dockerComposev1Path = Invoke-DownloadWithRetry -Url $dockerComposev1Url -Path "$dockerComposev1Dir\docker-compose.exe" +Test-FileChecksum $dockerComposev1Path -ExpectedSHA256Sum $externalHash +Add-MachinePathItem $dockerComposev1Dir +Update-Environment + Write-Host "Install-Package Docker-Compose v2" # Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 $toolsetVersion = (Get-ToolsetContent).docker.components.compose diff --git a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 index 53f22b1ed..70c0021eb 100644 --- a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -71,6 +71,7 @@ $tools.AddToolVersion("Cabal", $(Get-CabalVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("Docker", $(Get-DockerVersion)) +$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) $tools.AddToolVersion("Docker-wincred", $(Get-DockerWincredVersion)) $tools.AddToolVersion("ghc", $(Get-GHCVersion)) diff --git a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 index 0aa224fac..757316b6d 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -55,6 +55,11 @@ function Get-DockerVersion { return $dockerVersion } +function Get-DockerComposeVersion { + $dockerComposeVersion = docker-compose version --short + return $dockerComposeVersion +} + function Get-DockerComposeVersionV2 { $dockerComposeVersion = docker compose version --short return $dockerComposeVersion diff --git a/images/windows/scripts/tests/Docker.Tests.ps1 b/images/windows/scripts/tests/Docker.Tests.ps1 index 7cc4b60ab..dcd0dd70a 100644 --- a/images/windows/scripts/tests/Docker.Tests.ps1 +++ b/images/windows/scripts/tests/Docker.Tests.ps1 @@ -13,6 +13,9 @@ Describe "Docker" { } Describe "DockerCompose" { + It "docker-compose is installed" { + "docker-compose --version" | Should -ReturnZeroExitCode + } It "docker compose v2" { "docker compose version" | Should -ReturnZeroExitCode @@ -34,4 +37,4 @@ Describe "DockerImages" { docker images "$ImageName" --format "{{.Repository}}" | Should -Not -BeNullOrEmpty } } -} \ No newline at end of file +}