actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-20 06:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

removing the docker composev1 (#10407)

Browse Source 
Co-authored-by: Ravi Akshintala <raviakshintalagithub.com@Ravis-Laptop.local>
This commit is contained in:
RaviAkshintala
2024-08-08 10:07:02 +05:30
committed by GitHub
parent c31eef93ac
commit 7665ed4ef9
4 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,20 +2,6 @@
## File: Install-Docker-Compose.ps1 ## File: Install-Docker-Compose.ps1
## 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"
$toolsetVersion = (Get-ToolsetContent).docker.components.compose $toolsetVersion = (Get-ToolsetContent).docker.components.compose
$composeVersion = (Get-GithubReleasesByVersion -Repo "docker/compose" -Version "${toolsetVersion}").version $composeVersion = (Get-GithubReleasesByVersion -Repo "docker/compose" -Version "${toolsetVersion}").version

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

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

@@ -13,10 +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
} }