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

Get back container tools on Ubuntu 18&20 (#5611)

Browse Source
This commit is contained in:
Mikhail Timofeev
2022-05-25 20:25:12 +04:00
committed by GitHub
parent 102af04076
commit 4393b58dce
6 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -120,6 +120,9 @@ $toolsList = @(
(Get-DockerComposeV2Version),
(Get-DockerBuildxVersion),
(Get-DockerAmazonECRCredHelperVersion),
(Get-BuildahVersion),
(Get-PodManVersion),
(Get-SkopeoVersion),
(Get-GitVersion),
(Get-GitLFSVersion),
(Get-GitFTPVersion),
@@ -155,13 +158,6 @@ if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
(Get-HHVMVersion)
)
}
if (Test-IsUbuntu22) {
$toolsList += @(
(Get-BuildahVersion),
(Get-PodManVersion),
(Get-SkopeoVersion)
)
}
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$toolsList += (Get-FastlaneVersion)

12
images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -42,16 +42,28 @@ function Get-CodeQLBundleVersion {
function Get-PodManVersion {
$podmanVersion = podman --version | Take-OutputPart -Part 2
if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
$aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
return "Podman $podmanVersion (apt source repository: $aptSourceRepo)"
}
return "Podman $podmanVersion"
}
function Get-BuildahVersion {
$buildahVersion = buildah --version | Take-OutputPart -Part 2
if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
$aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
return "Buildah $buildahVersion (apt source repository: $aptSourceRepo)"
}
return "Buildah $buildahVersion"
}
function Get-SkopeoVersion {
$skopeoVersion = skopeo --version | Take-OutputPart -Part 2
if ((Test-IsUbuntu18) -or (Test-IsUbuntu20)) {
$aptSourceRepo = Get-AptSourceRepository -PackageName "containers"
return "Skopeo $skopeoVersion (apt source repository: $aptSourceRepo)"
}
return "Skopeo $skopeoVersion"
}