Skip to content

Commit 7741a89

Browse files
authored
Merge pull request #46325 from thaJeztah/24.0_backport_hack_less_redirects
[24.0 backport] Dockerfile: Windows: update Golang download domains to cut down redirects
2 parents 8ff9ef2 + 377af4c commit 7741a89

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ RUN `
224224
`
225225
Write-Host INFO: Downloading go...; `
226226
$dlGoVersion=$Env:GO_VERSION -replace '\.0$',''; `
227-
Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `
227+
Download-File "https://go.dev/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `
228228
`
229229
Write-Host INFO: Downloading compiler 1 of 3...; `
230230
Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `

hack/make.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ Try {
459459
if (-not $inContainer) { Verify-GoVersion }
460460

461461
# Verify GOPATH is set
462-
if ($env:GOPATH.Length -eq 0) { Throw "Missing GOPATH environment variable. See https://golang.org/doc/code.html#GOPATH" }
462+
if ($env:GOPATH.Length -eq 0) { Throw "Missing GOPATH environment variable. See https://pkg.go.dev/cmd/go#hdr-GOPATH_environment_variable" }
463463

464464
# Run autogen if building daemon.
465465
if ($Daemon) {

hack/make.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if [ "$AUTO_GOPATH" ]; then
7979
fi
8080

8181
if [ ! "$GOPATH" ]; then
82-
echo >&2 'error: missing GOPATH; please see https://golang.org/doc/code.html#GOPATH'
82+
echo >&2 'error: missing GOPATH; please see https://pkg.go.dev/cmd/go#hdr-GOPATH_environment_variable'
8383
echo >&2 ' alternatively, set AUTO_GOPATH=1'
8484
exit 1
8585
fi

0 commit comments

Comments
 (0)