mirror of
https://github.com/actions/runner-images.git
synced 2025-12-15 22:26:56 +00:00
removing the docker composev1 (#10407)
Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user