Skip to content

Commit

Permalink
Merge pull request #46325 from thaJeztah/24.0_backport_hack_less_redi…
Browse files Browse the repository at this point in the history
…rects

[24.0 backport] Dockerfile: Windows: update Golang download domains to cut down redirects
  • Loading branch information
thaJeztah authored Aug 25, 2023
2 parents 8ff9ef2 + 377af4c commit 7741a89
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ RUN `
`
Write-Host INFO: Downloading go...; `
$dlGoVersion=$Env:GO_VERSION -replace '\.0$',''; `
Download-File "https://golang.org/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `
Download-File "https://go.dev/dl/go${dlGoVersion}.windows-amd64.zip" C:\go.zip; `
`
Write-Host INFO: Downloading compiler 1 of 3...; `
Download-File https://raw.githubusercontent.com/moby/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `
Expand Down
2 changes: 1 addition & 1 deletion hack/make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ Try {
if (-not $inContainer) { Verify-GoVersion }

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

# Run autogen if building daemon.
if ($Daemon) {
Expand Down
2 changes: 1 addition & 1 deletion hack/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if [ "$AUTO_GOPATH" ]; then
fi

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

0 comments on commit 7741a89

Please sign in to comment.