Merge pull request #23 from linuxserver/go-url

fix trigger and download links

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of go branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_CLOUD9_GO\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -s https://golang.org/dl/ | awk -F '(go|.linux-amd64.tar.gz)' '/linux-amd64.tar.gz/ {print $2;exit}'
+          EXT_RELEASE=$(curl -sL https://go.dev/dl/ | awk -F '(go|.linux-amd64.tar.gz)' '/linux-amd64.tar.gz/ {print $2;exit}'
 )
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"

Dockerfile

@@ -14,7 +14,7 @@ ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
 RUN \
  echo "**** install Golang ****" && \
  if [ -z ${GO_VERSION+x} ]; then \
-        GO_VERSION=$(curl -s https://golang.org/dl/ \
+        GO_VERSION=$(curl -sL https://go.dev/dl/ \
 	| awk -F '(go|.linux-amd64.tar.gz)' '/linux-amd64.tar.gz/ {print $2;exit}'); \
  fi && \
  apt-get update && \
@@ -22,7 +22,7 @@ RUN \
 	build-essential && \
  curl -o \
 	/tmp/go.tar.gz -L \
-	https://dl.google.com/go/go"${GO_VERSION}".linux-amd64.tar.gz && \
+	https://go.dev/dl/go"${GO_VERSION}".linux-amd64.tar.gz && \
  cd /tmp && \
  tar xf \
 	go.tar.gz && \

Dockerfile.aarch64

@@ -14,7 +14,7 @@ ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
 RUN \
  echo "**** install Golang ****" && \
  if [ -z ${GO_VERSION+x} ]; then \
-        GO_VERSION=$(curl -s https://golang.org/dl/ \
+        GO_VERSION=$(curl -sL https://go.dev/dl/ \
 	| awk -F '(go|.linux-arm64.tar.gz)' '/linux-arm64.tar.gz/ {print $2;exit}'); \
  fi && \
  apt-get update && \
@@ -22,7 +22,7 @@ RUN \
 	build-essential && \
  curl -o \
 	/tmp/go.tar.gz -L \
-	https://dl.google.com/go/go"${GO_VERSION}".linux-arm64.tar.gz && \
+	https://go.dev/dl/go"${GO_VERSION}".linux-arm64.tar.gz && \
  cd /tmp && \
  tar xf \
 	go.tar.gz && \

Dockerfile.armhf

@@ -14,7 +14,7 @@ ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
 RUN \
  echo "**** install Golang ****" && \
  if [ -z ${GO_VERSION+x} ]; then \
-        GO_VERSION=$(curl -s https://golang.org/dl/ \
+        GO_VERSION=$(curl -sL https://go.dev/dl/ \
 	| awk -F '(go|.linux-armv6l.tar.gz)' '/linux-armv6l.tar.gz/ {print $2;exit}'); \
  fi && \
  apt-get update && \
@@ -22,7 +22,7 @@ RUN \
 	build-essential && \
  curl -o \
 	/tmp/go.tar.gz -L \
-	https://dl.google.com/go/go"${GO_VERSION}".linux-armv6l.tar.gz && \
+	https://go.dev/dl/go"${GO_VERSION}".linux-armv6l.tar.gz && \
  cd /tmp && \
  tar xf \
 	go.tar.gz && \

Jenkinsfile

@@ -104,7 +104,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -s https://golang.org/dl/ | awk -F '(go|.linux-amd64.tar.gz)' '/linux-amd64.tar.gz/ {print $2;exit}'
+            script: ''' curl -sL https://go.dev/dl/ | awk -F '(go|.linux-amd64.tar.gz)' '/linux-amd64.tar.gz/ {print $2;exit}'
  ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'

jenkins-vars.yml

@@ -4,7 +4,7 @@
 project_name: docker-cloud9
 external_type: na
 custom_version_command: |
-  curl -s https://golang.org/dl/ | awk -F '(go|.linux-amd64.tar.gz)' '/linux-amd64.tar.gz/ {print $2;exit}'
+  curl -sL https://go.dev/dl/ | awk -F '(go|.linux-amd64.tar.gz)' '/linux-amd64.tar.gz/ {print $2;exit}'
 release_type: prerelease
 release_tag: go
 ls_branch: go