diff --git a/images/win/scripts/Installers/Install-Docker.ps1 b/images/win/scripts/Installers/Install-Docker.ps1 index 0ba79d382..fa0dcaf63 100644 --- a/images/win/scripts/Installers/Install-Docker.ps1 +++ b/images/win/scripts/Installers/Install-Docker.ps1 @@ -14,6 +14,13 @@ Start-Service docker Write-Host "Install-Package Docker-Compose" Choco-Install -PackageName docker-compose +Write-Host "Install docker-wincred" +$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 +$dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl +Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Program Files\Docker" + +Write-Host "Download docker images" $dockerImages = (Get-ToolsetContent).docker.images foreach ($dockerImage in $dockerImages) { Write-Host "Pulling docker image $dockerImage ..." diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index 280b9c95e..fa8f299bf 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -96,6 +96,7 @@ $toolsList = @( (Get-CodeQLBundleVersion), (Get-DockerVersion), (Get-DockerComposeVersion), + (Get-DockerWincredVersion), (Get-GHCVersion), (Get-GitVersion), (Get-GitLFSVersion), diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 9456bf567..3534691e1 100644 --- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -61,6 +61,11 @@ function Get-DockerComposeVersion { return "Docker-compose $dockerComposeVersion" } +function Get-DockerWincredVersion { + $dockerCredVersion = $(docker-credential-wincred version) + return "Docker-wincred $dockerCredVersion" +} + function Get-GitVersion { $(git version) -match "git version (?\d+\.\d+\.\d+)" | Out-Null $gitVersion = $Matches.Version diff --git a/images/win/scripts/Tests/Docker.Tests.ps1 b/images/win/scripts/Tests/Docker.Tests.ps1 index 697de6a72..1a87c924f 100644 --- a/images/win/scripts/Tests/Docker.Tests.ps1 +++ b/images/win/scripts/Tests/Docker.Tests.ps1 @@ -6,6 +6,10 @@ Describe "Docker" { "$ToolName --version" | Should -ReturnZeroExitCode } + It "docker-wincred" { + "docker-credential-wincred version" | Should -ReturnZeroExitCode + } + It "docker service is up" { "docker images" | Should -ReturnZeroExitCode }