diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1 index d53ed2004..40757770b 100644 --- a/images/windows/scripts/build/Install-DockerCompose.ps1 +++ b/images/windows/scripts/build/Install-DockerCompose.ps1 @@ -2,20 +2,6 @@ ## File: Install-Docker-Compose.ps1 ## 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" $toolsetVersion = (Get-ToolsetContent).docker.components.compose $composeVersion = (Get-GithubReleasesByVersion -Repo "docker/compose" -Version "${toolsetVersion}").version diff --git a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 index 70c0021eb..53f22b1ed 100644 --- a/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 +++ b/images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 @@ -71,7 +71,6 @@ $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 757316b6d..0aa224fac 100644 --- a/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 +++ b/images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1 @@ -55,11 +55,6 @@ 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 dcd0dd70a..d2565f15f 100644 --- a/images/windows/scripts/tests/Docker.Tests.ps1 +++ b/images/windows/scripts/tests/Docker.Tests.ps1 @@ -13,10 +13,6 @@ Describe "Docker" { } Describe "DockerCompose" { - It "docker-compose is installed" { - "docker-compose --version" | Should -ReturnZeroExitCode - } - It "docker compose v2" { "docker compose version" | Should -ReturnZeroExitCode }