Skip to content

Commit d3a5bad

Browse files
[Windows] Install Docker-wincred (#4540)
* Add Docker WinCred * fix getting docker url * Use Expand-Archive instead of Extract-7Zip since 7zip is not installed yet
1 parent f38b217 commit d3a5bad

File tree

4 files changed

+17
-0
lines changed

4 files changed

+17
-0
lines changed

images/win/scripts/Installers/Install-Docker.ps1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ Start-Service docker
1414
Write-Host "Install-Package Docker-Compose"
1515
Choco-Install -PackageName docker-compose
1616

17+
Write-Host "Install docker-wincred"
18+
$dockerCredLatestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/docker/docker-credential-helpers/releases/latest"
19+
$dockerCredDownloadUrl = $dockerCredLatestRelease.assets.browser_download_url -match "docker-credential-wincred-.+\.zip" | Select-Object -First 1
20+
$dockerCredArchive = Start-DownloadWithRetry -Url $dockerCredDownloadUrl
21+
Expand-Archive -Path $dockerCredArchive -DestinationPath "C:\Program Files\Docker"
22+
23+
Write-Host "Download docker images"
1724
$dockerImages = (Get-ToolsetContent).docker.images
1825
foreach ($dockerImage in $dockerImages) {
1926
Write-Host "Pulling docker image $dockerImage ..."

images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ $toolsList = @(
9696
(Get-CodeQLBundleVersion),
9797
(Get-DockerVersion),
9898
(Get-DockerComposeVersion),
99+
(Get-DockerWincredVersion),
99100
(Get-GHCVersion),
100101
(Get-GitVersion),
101102
(Get-GitLFSVersion),

images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ function Get-DockerComposeVersion {
6161
return "Docker-compose $dockerComposeVersion"
6262
}
6363

64+
function Get-DockerWincredVersion {
65+
$dockerCredVersion = $(docker-credential-wincred version)
66+
return "Docker-wincred $dockerCredVersion"
67+
}
68+
6469
function Get-GitVersion {
6570
$(git version) -match "git version (?<version>\d+\.\d+\.\d+)" | Out-Null
6671
$gitVersion = $Matches.Version

images/win/scripts/Tests/Docker.Tests.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Describe "Docker" {
66
"$ToolName --version" | Should -ReturnZeroExitCode
77
}
88

9+
It "docker-wincred" {
10+
"docker-credential-wincred version" | Should -ReturnZeroExitCode
11+
}
12+
913
It "docker service is up" {
1014
"docker images" | Should -ReturnZeroExitCode
1115
}

0 commit comments

Comments
 (0)