diff options
| author | Tibor Vass <tiborvass@users.noreply.github.com> | 2019-09-11 17:34:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 17:34:45 -0700 |
| commit | 2900a919f44821fc94f3dfcf3fcc0516ca9a4fc2 (patch) | |
| tree | 6dd572fd4c73af1b9bf9b88588abcccbe79bea21 /Dockerfile.windows | |
| parent | 234b95148363d0c9d045900afc88e27721242eb4 (diff) | |
| parent | 61450a651ba8fe4ef3cac284482a9495fc0b761d (diff) | |
| download | docker-2900a919f44821fc94f3dfcf3fcc0516ca9a4fc2.tar.gz | |
Merge pull request #39879 from thaJeztah/fix_go_version_check_again
hack/ci/windows.ps1: fix Go version check (due to trailing .0)
Diffstat (limited to 'Dockerfile.windows')
| -rw-r--r-- | Dockerfile.windows | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Dockerfile.windows b/Dockerfile.windows index 9b230b1b12..40eb5f490b 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -214,7 +214,8 @@ RUN ` Download-File $location C:\gitsetup.zip; ` ` Write-Host INFO: Downloading go...; ` - Download-File $('https://golang.org/dl/go'+$Env:GO_VERSION.TrimEnd('.0')"+'.windows-amd64.zip') C:\go.zip; ` + $dlGoVersion=$Env:GO_VERSION -replace '\.0$',''; ` + Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; ` ` Write-Host INFO: Downloading compiler 1 of 3...; ` Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip C:\gcc.zip; ` |