actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 22:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] remove Docker Comose v1 (#9558)

Browse Source
This commit is contained in:
Mikhail Koliada
2024-03-25 16:53:38 +01:00
committed by GitHub
parent 2259d75568
commit 9ee0335bca
4 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/windows/scripts/build/Install-DockerCompose.ps1
View File

@@ -1,13 +1,8 @@
################################################################################ ################################################################################
## File: Install-Docker-Compose.ps1 ## File: Install-Docker-Compose.ps1
## Desc: Install Docker Compose. ## 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" Write-Host "Install-Package Docker-Compose v2"
# Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172 # Temporaty pinned to v2.23.3 due https://github.com/actions/runner-images/issues/9172
$toolsetVersion = (Get-ToolsetContent).docker.components.compose $toolsetVersion = (Get-ToolsetContent).docker.components.compose

1
images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -71,7 +71,6 @@ $tools.AddToolVersion("Cabal", $(Get-CabalVersion))
$tools.AddToolVersion("CMake", $(Get-CMakeVersion)) $tools.AddToolVersion("CMake", $(Get-CMakeVersion))
$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion)) $tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion))
$tools.AddToolVersion("Docker", $(Get-DockerVersion)) $tools.AddToolVersion("Docker", $(Get-DockerVersion))
$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeVersion))
$tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2)) $tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeVersionV2))
$tools.AddToolVersion("Docker-wincred", $(Get-DockerWincredVersion)) $tools.AddToolVersion("Docker-wincred", $(Get-DockerWincredVersion))
$tools.AddToolVersion("ghc", $(Get-GHCVersion)) $tools.AddToolVersion("ghc", $(Get-GHCVersion))

5
images/windows/scripts/docs-gen/SoftwareReport.Tools.psm1
View File

@@ -55,11 +55,6 @@ function Get-DockerVersion {
return $dockerVersion return $dockerVersion
} }
function Get-DockerComposeVersion {
$dockerComposeVersion = docker-compose version --short
return $dockerComposeVersion
}
function Get-DockerComposeVersionV2 { function Get-DockerComposeVersionV2 {
$dockerComposeVersion = docker compose version --short $dockerComposeVersion = docker compose version --short
return $dockerComposeVersion return $dockerComposeVersion

3
images/windows/scripts/tests/Docker.Tests.ps1
View File

@@ -13,9 +13,6 @@ Describe "Docker" {
} }
Describe "DockerCompose" { Describe "DockerCompose" {
It "docker-compose is installed" {
"docker-compose --version" | Should -ReturnZeroExitCode
}
It "docker compose v2" { It "docker compose v2" {
"docker compose version" | Should -ReturnZeroExitCode "docker compose version" | Should -ReturnZeroExitCode