Merge pull request #413 from linuxserver/code-server-golang-s6v3

switch to hybrid (code-server-golang)

Dockerfile

@@ -11,13 +11,13 @@ RUN \
  fi && \
  mkdir -p /root-layer/golang && \
  curl -o \
-    /root-layer/golang/golang_x86_64.tar.gz -L \
+    /root-layer/golang/golang_x86_64.tar.gz -fL \
     https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz && \
  curl -o \
-    /root-layer/golang/golang_armv7l.tar.gz -L \
+    /root-layer/golang/golang_armv7l.tar.gz -fL \
     https://go.dev/dl/go${GO_VERSION}.linux-armv6l.tar.gz && \
  curl -o \
-    /root-layer/golang/golang_aarch64.tar.gz -L \
+    /root-layer/golang/golang_aarch64.tar.gz -fL \
     https://go.dev/dl/go${GO_VERSION}.linux-arm64.tar.gz
 
 COPY root/ /root-layer/

README.md

@@ -1,8 +1,8 @@
-# Golang - Docker mod for code-server
+# Golang - Docker mod for code-server and openvscode-server
 
-This mod adds golang/go to code-server.
+This mod adds golang/go to code-server and openvscode-server.
 
-In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-golang`
+In code-server or openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-golang`
 
 If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-golang|linuxserver/mods:code-server-mod2`
 
@@ -18,4 +18,4 @@ If adding multiple mods, enter them in an array separated by `|`, such as `DOCKE
 - `linuxserver/mods:code-server-golang` will install the latest stable release, which is `1.14.2` as of 2020/05/07
 - `linuxserver/mods:code-server-golang-1.14.2` will install the specific `1.14.2` release
 
-Visit https://hub.docker.com/r/linuxserver/mods/tags?page=1&name=code-server-golang to see all available tags
+Visit https://hub.docker.com/r/linuxserver/mods/tags?page=1&name=code-server-golang to see all available tags

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-golang-add-package/run

@@ -0,0 +1,25 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** ensuring golang is in PATH ****"
+if grep -q -E '^(export )?PATH=' /etc/services.d/code-server/run; then
+    if ! grep -q -E '^(export )?PATH=.*/usr/local/go/bin.*' /etc/services.d/code-server/run; then
+        sed -i '/PATH/ s/$/:\/usr\/local\/go\/bin/' /etc/services.d/code-server/run
+    fi
+    if ! grep -q -E '^(export )?PATH=.*/config/go/bin:.*' /etc/services.d/code-server/run; then
+        sed -i 's/PATH=/PATH=\/config\/go\/bin:/g' /etc/services.d/code-server/run
+    fi
+else
+    sed -i '/^#!\/usr\/bin/a \\n# Added by codeserver-golang\nexport PATH=/config/go/bin:$PATH:/usr/local/go/bin' /etc/services.d/code-server/run
+fi
+
+ARCH=$(uname -m)
+if [ -f "/golang/golang_${ARCH}.tar.gz" ]; then
+    echo "**** Installing golang ****"
+    tar xzf "/golang/golang_${ARCH}.tar.gz" -C /usr/local
+    rm -rf /golang
+
+    echo "**** Adding gcc to package install list, to make CGO work ****"
+    echo "gcc" >> /mod-repo-packages-to-install.list
+else
+    echo "**** Golang already installed, skipping ****"
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-golang-add-package/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-golang-add-package/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-golang-add-package/run