Skip to content

Commit f1b0726

Browse files
author
quietsy
authored
Merge pull request #330 from linuxserver/code-server-golang-url
update url
2 parents 703c5ff + 3c3d418 commit f1b0726

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/BuildImage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Build image
2222
run: |
2323
# Set version
24-
GO_WEBSITE=$(curl -sX GET https://golang.org/dl/)
24+
GO_WEBSITE=$(curl -sLX GET https://go.dev/dl/)
2525
GO_VERSION=${{ github.event.inputs.GO_VERSION }}
2626
GO_VERSION=${GO_VERSION:-$(echo "$GO_WEBSITE" | grep -o '<span.*>.*linux-amd64.*</span>' | grep -oP '(?<=go).*(?=.linux)')}
2727
if [ $(echo "$GO_VERSION" | tr -d -c '.' | awk '{ print length; }') = "1" ]; then GO_TAG="${GO_VERSION}.0"; else GO_TAG="${GO_VERSION}"; fi

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
22

33
ARG GO_VERSION
44

@@ -7,18 +7,18 @@ RUN \
77
curl \
88
grep && \
99
if [ -z ${GO_VERSION+x} ]; then \
10-
GO_VERSION=$(curl -sX GET https://golang.org/dl/ | grep -o '<span.*>.*linux-amd64.*</span>' | grep -oP '(?<=go).*(?=.linux)'); \
10+
GO_VERSION=$(curl -sLX GET https://go.dev/dl/ | grep -o '<span.*>.*linux-amd64.*</span>' | grep -oP '(?<=go).*(?=.linux)'); \
1111
fi && \
1212
mkdir -p /root-layer/golang && \
1313
curl -o \
1414
/root-layer/golang/golang_x86_64.tar.gz -L \
15-
https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz && \
15+
https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz && \
1616
curl -o \
1717
/root-layer/golang/golang_armv7l.tar.gz -L \
18-
https://dl.google.com/go/go${GO_VERSION}.linux-armv6l.tar.gz && \
18+
https://go.dev/dl/go${GO_VERSION}.linux-armv6l.tar.gz && \
1919
curl -o \
2020
/root-layer/golang/golang_aarch64.tar.gz -L \
21-
https://dl.google.com/go/go${GO_VERSION}.linux-arm64.tar.gz
21+
https://go.dev/dl/go${GO_VERSION}.linux-arm64.tar.gz
2222

2323
COPY root/ /root-layer/
2424

0 commit comments

Comments
 (0)