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

[Windows] Update docker-compose installation method (#9618)

Browse Source
This commit is contained in:
Alexey-Ayupov
2024-04-03 18:38:52 +02:00
committed by GitHub
parent df41637c07
commit cd4088d282
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,19 @@
## Desc: Install Docker Compose. ## 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" 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,6 +71,7 @@ $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,6 +55,11 @@ 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,6 +13,9 @@ 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