From 9ee0335bca637272ec439ed8b9a8b9108a7d39b2 Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Mon, 25 Mar 2024 16:53:38 +0100
Subject: [PATCH] [Windows] remove Docker Comose v1 (#9558)

---
 images/windows/scripts/build/Install-DockerCompose.ps1      | 5 -----
 images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1 | 1 -
 images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1   | 5 -----
 images/windows/scripts/tests/Docker.Tests.ps1               | 3 ---
 4 files changed, 14 deletions(-)

diff --git a/images/windows/scripts/build/Install-DockerCompose.ps1 b/images/windows/scripts/build/Install-DockerCompose.ps1
index 962b396cb..7e819398b 100644
--- a/images/windows/scripts/build/Install-DockerCompose.ps1
+++ b/images/windows/scripts/build/Install-DockerCompose.ps1
@@ -1,13 +1,8 @@
 ################################################################################
 ##  File:  Install-Docker-Compose.ps1
 ##  Desc:  Install Docker Compose.
-##  Supply chain security: Docker Compose v1 - by package manager
 ################################################################################
 
-Write-Host "Install-Package Docker-Compose v1"
-$versionToInstall = Resolve-ChocoPackageVersion -PackageName "docker-compose" -TargetVersion "1.29"
-Install-ChocoPackage docker-compose -ArgumentList "--version=$versionToInstall"
-
 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 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 d5a325ef8..7cc4b60ab 100644
--- a/images/windows/scripts/tests/Docker.Tests.ps1
+++ b/images/windows/scripts/tests/Docker.Tests.ps1
@@ -13,9 +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