From c0f1e37bd9df35eb75358330ba7705cac5949fd8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 20 Jul 2019 12:46:07 +0200 Subject: [PATCH] Dockerfile.windows: trim .0 from Go versions This was an oversight when changing the Dockerfile to use a build-arg; the Windows Dockerfile downloads the Go binaries, which never have a trailing `.0`. This patch makes sure that the trailing zero (if any) is removed. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit c5bd6e3dc7680d6c683496f63dafb1f30f87eaa7) Signed-off-by: Kir Kolyshkin Upstream-commit: 8f1a27c51f93698b5fe17f0fb043f47794e11cca Component: engine --- components/engine/Dockerfile.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/Dockerfile.windows b/components/engine/Dockerfile.windows index 75ad143b06..6dc3a859b2 100644 --- a/components/engine/Dockerfile.windows +++ b/components/engine/Dockerfile.windows @@ -207,7 +207,7 @@ RUN ` Download-File $location C:\gitsetup.zip; ` ` Write-Host INFO: Downloading go...; ` - Download-File $('https://golang.org/dl/go'+$Env:GO_VERSION+'.windows-amd64.zip') C:\go.zip; ` + Download-File $('https://golang.org/dl/go'+$Env:GO_VERSION.TrimEnd('.0')"+'.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; `