actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-24 21:57:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu] Deprecating docker compose v1 from ubuntu images (#10368)

Browse Source 
* Deprecating docker compose v1 from un=buntu images

* Pin sql version for win-19
This commit is contained in:
kishorekumar-anchala
2024-07-30 21:38:05 +05:30
committed by GitHub
parent 137d0ed83d
commit 582bbb9c15
6 changed files with 3 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -111,9 +111,6 @@ $tools.AddToolVersion("Buildah", $(Get-BuildahVersion))
$tools.AddToolVersion("CMake", $(Get-CMakeVersion))
$tools.AddToolVersion("CodeQL Action Bundle", $(Get-CodeQLBundleVersion))
$tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonECRCredHelperVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version))
}
$tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version))
$tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion))
$tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion))

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

@@ -58,10 +58,7 @@ function Get-CMakeVersion {
return $cmakeVersion
}
function Get-DockerComposeV1Version {
$composeVersion = docker-compose -v | Get-StringPart -Part 2 | Get-StringPart -Part 0 -Delimiter ","
return $composeVersion
}
function Get-DockerComposeV2Version {
$composeVersion = docker compose version | Get-StringPart -Part 3 | Get-StringPart -Part 0 -Delimiter "v"