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

[ubuntu] Change docker to install from official repository (#8107)

Browse Source
This commit is contained in:
Shamil Mubarakshin
2023-08-18 23:41:11 +02:00
committed by GitHub
parent 392aa0ebd4
commit d44b8a46e2
5 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,8 +108,8 @@ $tools.AddToolVersion("Docker Amazon ECR Credential Helper", $(Get-DockerAmazonE
$tools.AddToolVersion("Docker Compose v1", $(Get-DockerComposeV1Version))
$tools.AddToolVersion("Docker Compose v2", $(Get-DockerComposeV2Version))
$tools.AddToolVersion("Docker-Buildx", $(Get-DockerBuildxVersion))
$tools.AddToolVersion("Docker-Moby Client", $(Get-DockerMobyClientVersion))
$tools.AddToolVersion("Docker-Moby Server", $(Get-DockerMobyServerVersion))
$tools.AddToolVersion("Docker Client", $(Get-DockerClientVersion))
$tools.AddToolVersion("Docker Server", $(Get-DockerServerVersion))
if ((Test-IsUbuntu20) -or (Test-IsUbuntu22)) {
$tools.AddToolVersion("Fastlane", $(Get-FastlaneVersion))
}

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

@@ -69,22 +69,22 @@ function Get-DockerComposeV1Version {
}
function Get-DockerComposeV2Version {
$composeVersion = docker compose version | Take-OutputPart -Part 3
$composeVersion = docker compose version | Take-OutputPart -Part 3 | Take-OutputPart -Part 0 -Delimiter "v"
return $composeVersion
}
function Get-DockerMobyClientVersion {
function Get-DockerClientVersion {
$dockerClientVersion = sudo docker version --format '{{.Client.Version}}'
return $dockerClientVersion
}
function Get-DockerMobyServerVersion {
function Get-DockerServerVersion {
$dockerServerVersion = sudo docker version --format '{{.Server.Version}}'
return $dockerServerVersion
}
function Get-DockerBuildxVersion {
$buildxVersion = docker buildx version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "+"
$buildxVersion = docker buildx version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "v"
return $buildxVersion
}