diff options
| author | Albin <albin@mullvad.net> | 2022-04-29 07:32:07 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-08-15 11:33:08 +0200 |
| commit | 14c30056b97569da2b7cc178f160638695965437 (patch) | |
| tree | 453efec27e54f3bb9f13d2282efd324d9e6a637f | |
| parent | 4376f612e9e69d37ebc005bcbc52c29abd4024fe (diff) | |
| download | mullvadvpn-14c30056b97569da2b7cc178f160638695965437.tar.xz mullvadvpn-14c30056b97569da2b7cc178f160638695965437.zip | |
Unify golang download urls
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | android/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | android/fdroid-build/init.sh | 2 | ||||
| -rw-r--r-- | wireguard/libwg/Android.mk | 2 | ||||
| -rw-r--r-- | wireguard/libwg/Dockerfile_AndroidPatchedGoruntime | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile index 563cc13c86..3e2b1c08eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,9 @@ RUN apt update -y && apt install build-essential \ # Install golang ENV GOLANG_VERSION 1.16 -# Found on https://golang.org/dl/ +# Found on https://go.dev/dl/ ENV GOLANG_HASH 013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 -RUN curl -Lo go.tgz https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \ +RUN curl -Lo go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \ echo $(sha256sum go.tgz) && \ echo "${GOLANG_HASH} go.tgz" | sha256sum -c - && \ tar -C /usr/local -xzf go.tgz && \ diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 7a46151646..1f59b3e557 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -47,7 +47,7 @@ ENV ANDROID_NDK_HOME="/opt/android/android-ndk-r20b" \ COPY goruntime-boottime-over-monotonic.diff /tmp/goruntime-boottime-over-monotonic.diff RUN cd /tmp && \ - curl -sf -L -O https://dl.google.com/go/go1.16.linux-amd64.tar.gz && \ + curl -sf -L -O https://go.dev/dl/go1.16.linux-amd64.tar.gz && \ echo "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 go1.16.linux-amd64.tar.gz" | sha256sum -c && \ cd /opt && \ tar -xzf /tmp/go1.16.linux-amd64.tar.gz && \ diff --git a/android/fdroid-build/init.sh b/android/fdroid-build/init.sh index f363372df7..e4212c2f47 100755 --- a/android/fdroid-build/init.sh +++ b/android/fdroid-build/init.sh @@ -21,7 +21,7 @@ rustup target add \ # Install Go cd "$HOME" -curl -sf -L -O https://golang.org/dl/go1.16.linux-amd64.tar.gz +curl -sf -L -O https://go.dev/dl/go1.16.linux-amd64.tar.gz echo "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 go1.16.linux-amd64.tar.gz" | sha256sum -c tar -xzvf go1.16.linux-amd64.tar.gz patch -p1 -f -N -r- -d "$HOME/go" < "$REPO_DIR/wireguard/libwg/goruntime-boottime-over-monotonic.diff" diff --git a/wireguard/libwg/Android.mk b/wireguard/libwg/Android.mk index cfbf5e3eb5..04b89f12ed 100644 --- a/wireguard/libwg/Android.mk +++ b/wireguard/libwg/Android.mk @@ -23,7 +23,7 @@ default: $(DESTDIR)/libwg.so GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m)) GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]') GOBUILDVERSION := 1.12 -GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz +GOBUILDTARBALL := https://go.dev/dl/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH) $(DESTDIR)/libwg.so: diff --git a/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime b/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime index 12b1248fa1..792af9427d 100644 --- a/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime +++ b/wireguard/libwg/Dockerfile_AndroidPatchedGoruntime @@ -33,7 +33,7 @@ ENV GOLANG_HASH 013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 # Install Go-lang and patch it to use the appropriate monotonic clock COPY goruntime-boottime-over-monotonic.diff /opt/goruntime-boottime-over-monotonic.diff RUN cd /tmp && \ - curl -sf -L -o go.tgz https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \ + curl -sf -L -o go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \ echo "${GOLANG_HASH} go.tgz" | sha256sum -c - && \ cd /opt && \ tar -xzf /tmp/go.tgz && \ |