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

[Windows] Add docker symlink (#6287)

Browse Source
This commit is contained in:
Aleksandr Chebotov
2022-09-24 16:09:06 +02:00
committed by GitHub
parent dc7240348e
commit f412cb04d7
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
images/win/scripts/Installers/Install-Docker.ps1
View File

@@ -10,6 +10,11 @@ $instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers
$instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1" $instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1"
& $instScriptPath & $instScriptPath
# Fix AZ CLI DOCKER_COMMAND_ERROR
# cli.azure.cli.command_modules.acr.custom: Could not run 'docker.exe' command.
# https://github.com/Azure/azure-cli/issues/18766
New-Item -ItemType SymbolicLink -Path "C:\Windows\SysWOW64\docker.exe" -Target "C:\Windows\System32\docker.exe"
Write-Host "Install-Package Docker-Compose v1" Write-Host "Install-Package Docker-Compose v1"
Choco-Install -PackageName docker-compose Choco-Install -PackageName docker-compose
@@ -21,9 +26,8 @@ Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -Downl
Write-Host "Install docker-wincred" Write-Host "Install docker-wincred"
$dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest" $dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest"
$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.zip" | Select-Object -First 1 $dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.exe" | Select-Object -First 1
$dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl Start-DownloadWithRetry -Url $dockerCredDownloadUrl -DownloadPath "C:\Windows\System32" -Name "docker-credential-wincred.exe"
Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Windows\System32"
Write-Host "Download docker images" Write-Host "Download docker images"
$dockerImages = (Get-ToolsetContent).docker.images $dockerImages = (Get-ToolsetContent).docker.images

2
images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -66,7 +66,7 @@ function Get-DockerComposeVersionV2 {
} }
function Get-DockerWincredVersion { function Get-DockerWincredVersion {
$dockerCredVersion = $(docker-credential-wincred version) $dockerCredVersion = docker-credential-wincred version | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "v"
return "Docker-wincred $dockerCredVersion" return "Docker-wincred $dockerCredVersion"
} }

4
images/win/scripts/Tests/Docker.Tests.ps1
View File

@@ -17,6 +17,10 @@ Describe "Docker" {
It "docker service is up" { It "docker service is up" {
"docker images" | Should -ReturnZeroExitCode "docker images" | Should -ReturnZeroExitCode
} }
It "docker symlink" {
"C:\Windows\SysWOW64\docker.exe ps" | Should -ReturnZeroExitCode
}
} }
Describe "DockerImages" { Describe "DockerImages" {