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] Replace Docker EE with Docker CE (#6220)

Browse Source
This commit is contained in:
Mikhail Timofeev
2022-09-13 08:13:08 +03:00
committed by GitHub
parent cecc9022fa
commit 9d9b5da489
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,24 +5,25 @@
## can continue. ## can continue.
################################################################################ ################################################################################
# Docker EE 20.10.8 has the regression Write-Host "Install Docker CE"
# fatal: open C:\ProgramData\docker\panic.log: Access is denied. $instScriptUrl = "https://raw.githubusercontent.com/microsoft/Windows-Containers/Main/helpful_tools/Install-DockerCE/install-docker-ce.ps1"
Write-Host "Install-Package Docker" $instScriptPath = Start-DownloadWithRetry -Url $instScriptUrl -Name "install-docker-ce.ps1"
Install-Package -Name docker -ProviderName DockerMsftProvider -RequiredVersion 20.10.7 -Force & $instScriptPath
Start-Service docker
Write-Host "Install-Package Docker-Compose v1" Write-Host "Install-Package Docker-Compose v1"
Choco-Install -PackageName docker-compose Choco-Install -PackageName docker-compose
Write-Host "Install-Package Docker-Compose v2" Write-Host "Install-Package Docker-Compose v2"
$dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe" $dockerComposev2Url = "https://github.com/docker/compose/releases/latest/download/docker-compose-windows-x86_64.exe"
Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath "C:\Program Files\Docker\cli-plugins" $cliPluginsDir = "C:\ProgramData\docker\cli-plugins"
New-Item -Path $cliPluginsDir -ItemType Directory
Start-DownloadWithRetry -Url $dockerComposev2Url -Name docker-compose.exe -DownloadPath $cliPluginsDir
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-.+\.zip" | Select-Object -First 1
$dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl $dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl
Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Program Files\Docker" 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.Helpers.psm1
View File

@@ -122,7 +122,7 @@ function Test-BlankElement {
$splitByLines = $Markdown.Split("`n") $splitByLines = $Markdown.Split("`n")
# Validate entry without version # Validate entry without version
$blankVersions = $splitByLines -match "^-" -notmatch "(OS|Image) Version|WSL|Vcpkg|\d\." | Out-String $blankVersions = $splitByLines -match "^-" -notmatch "(OS|Image) Version|WSL|Vcpkg|Docker|\d\." | Out-String
# Validate tables with blank rows # Validate tables with blank rows
$blankRows = "" $blankRows = ""