Merge pull request #321 from MateoPeri/code-server-julia

code-server:julia initial commit

.github/workflows/BuildImage.yml

@@ -3,9 +3,9 @@ name: Build Image
 on: [push, pull_request, workflow_dispatch]
 
 env:
-  ENDPOINT: "linuxserver/mods" #don't modify
+  ENDPOINT: "linuxserver/mods"
-  BASEIMAGE: "replace_baseimage" #replace
+  BASEIMAGE: "code-server"
-  MODNAME: "replace_modname" #replace
+  MODNAME: "julia"
 
 jobs:
   build:
@@ -15,14 +15,21 @@ jobs:
 
       - name: Build image
         run: |
-          docker build --no-cache -t ${{ github.sha }} .
+          # Set version
+          JULIA_VERSION=$(curl -sfX GET "https://api.github.com/repos/JuliaLang/julia/releases/latest" | jq -r '. | .tag_name' | sed 's|^v||')
+          echo "JULIA_VERSION=${JULIA_VERSION}" >> $GITHUB_ENV
+          docker build --no-cache --build-arg JULIA_VERSION="${JULIA_VERSION}" -t ${{ github.sha }} .
 
       - name: Tag image
         if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
         run: |
           docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}
+          docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.JULIA_VERSION }}
+          docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.JULIA_VERSION }}-${{ github.sha }}
           docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
           docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
+          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.JULIA_VERSION }}
+          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.JULIA_VERSION }}-${{ github.sha }}
           docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
 
       - name: Credential check
@@ -47,6 +54,8 @@ jobs:
       - name: Push tags to GitHub Container Registry
         if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }}
         run: |
+          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.JULIA_VERSION }}
+          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.JULIA_VERSION }}-${{ github.sha }}
           docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
           docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
 
@@ -58,5 +67,7 @@ jobs:
       - name: Push tags to DockerHub
         if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
         run: |
+          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.JULIA_VERSION }}
+          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.JULIA_VERSION }}-${{ github.sha }}
           docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
           docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}

Dockerfile

@@ -1,6 +1,37 @@
+FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
+
+ARG JULIA_VERSION
+
+RUN \
+  apk add --no-cache \
+    curl \
+    jq && \
+  if [ -z "${JULIA_VERSION}" ]; then \
+    JULIA_VERSION=$(curl -sX GET "https://api.github.com/repos/JuliaLang/julia/releases/latest" \
+    | jq -r '. | .tag_name' \
+    | sed 's|^v||'); \
+  fi && \
+  JULIA_MIN_VERSION=$(echo "${JULIA_VERSION}" | cut -d. -f 1,2) && \
+  mkdir -p /root-layer/julia-bins && \
+  echo "**** Downloading x86_64 binary ****" && \
+  curl -f --retry 3 --retry-connrefused \
+    "https://julialang-s3.julialang.org/bin/linux/x64/${JULIA_MIN_VERSION}/julia-${JULIA_VERSION}-linux-x86_64.tar.gz" -o \
+    "/root-layer/julia-bins/julia-x86_64.tar.gz" && \
+  echo "**** Downloading armv7l binary ****" && \
+  curl -f --retry 3 --retry-connrefused \
+    "https://julialang-s3.julialang.org/bin/linux/armv7l/${JULIA_MIN_VERSION}/julia-${JULIA_VERSION}-linux-armv7l.tar.gz" -o \
+    "/root-layer/julia-bins/julia-armv7l.tar.gz" && \
+  echo "**** Downloading aarch64 binary ****" && \
+  curl -f --retry 3 --retry-connrefused \
+    "https://julialang-s3.julialang.org/bin/linux/aarch64/${JULIA_MIN_VERSION}/julia-${JULIA_VERSION}-linux-aarch64.tar.gz" -o \
+    "/root-layer/julia-bins/julia-aarch64.tar.gz"
+
+COPY root/ /root-layer/
+
+# runtime stage
 FROM scratch
 
-LABEL maintainer="username"
+LABEL maintainer="MateoPeri"
 
-# copy local files
+# Add files from buildstage
-COPY root/ /
+COPY --from=buildstage /root-layer/ /

Dockerfile.complex

@@ -1,23 +0,0 @@
-## Buildstage ##
-FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage
-
-RUN \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	curl && \
- echo "**** grab rclone ****" && \
- mkdir -p /root-layer && \
- curl -o \
-	/root-layer/rclone.deb -L \
-	"https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb"
-
-# copy local files
-COPY root/ /root-layer/
-
-## Single layer deployed image ##
-FROM scratch
-
-LABEL maintainer="username"
-
-# Add files from buildstage
-COPY --from=buildstage /root-layer/ /

README.md

@@ -1,25 +1,9 @@
-# Rsync - Docker mod for openssh-server
+# Julia - Docker mod for code-server
 
-This mod adds rsync to openssh-server, to be installed/updated during container start.
+This mod adds a Julia dev environment to code-server, to be installed/updated during container start.
 
-In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
+In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-julia`
 
-If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2`
+If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-julia|linuxserver/mods:code-server-mod2`
 
-# Mod creation instructions
+By default, the latest stable version of Julia will be installed. If you'd like to install a different version, you can specify the version as a tag, from a list of published tags: https://hub.docker.com/r/linuxserver/mods/tags?page=1&name=code-server-julia (ie. `DOCKER_MODS=linuxserver/mods:code-server-julia-1.7.2`).
-
-* Fork the repo, create a new branch based on the branch `template`.
-* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done.
-* Inspect the `root` folder contents. Edit, add and remove as necessary.
-* Edit this readme with pertinent info, delete these instructions.
-* Finally edit the `.github/workflows/BuildImage.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`.
-* Ask the team to create a new branch named `<baseimagename>-<modname>`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch.
-* Submit PR against the branch created by the team.
-
-
-## Tips and tricks
-
-* To decrease startup times when multiple mods are used, we have consolidated `apt-get update` down to one file. As seen in the [nodejs mod](https://github.com/linuxserver/docker-mods/tree/code-server-nodejs/root/etc/cont-init.d)
-* Some images has helpers built in, these images are currently:
-    * [Openvscode-server](https://github.com/linuxserver/docker-openvscode-server/pull/10/files)
-    * [Code-server](https://github.com/linuxserver/docker-code-server/pull/95)

root/etc/cont-init.d/98-julia

@@ -0,0 +1,22 @@
+#!/usr/bin/with-contenv bash
+
+if [ -d "/julia-bins" ]; then
+  echo "**** Installing/updating Julia ****"
+  ARCH=$(uname -m)
+  mkdir -p /julia
+  tar xf "/julia-bins/julia-${ARCH}.tar.gz" -C \
+    /julia --strip-components=1
+  rm -rf /usr/local/bin/julia
+  ln -s /julia/bin/julia /usr/local/bin/julia
+  chmod +x /julia/bin/julia
+else
+  echo "**** Latest stable version of Julia already installed ****"
+fi
+
+echo "**** Installing vscode extensions julia, julia-formatter and better-toml ****"
+# extensions
+install-extension julialang.language-julia
+# vscode-julia-formatter
+install-extension singularitti.vscode-julia-formatter
+# better-toml
+install-extension bungcip.better-toml

root/etc/cont-init.d/98-vpn-config

@@ -1,27 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# Determine if setup is needed
-if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \
-[ -f /usr/bin/apt ]; then
-  ## Ubuntu
-  apt-get update
-  apt-get install --no-install-recommends -y \
-    iptables \
-    openssh-client \
-    python3 \
-    python3-pip 
-  pip3 install sshuttle
-fi
-if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \
-[ -f /sbin/apk ]; then
-  # Alpine
-  apk add --no-cache \
-    iptables \
-    openssh \
-    py3-pip \
-    python3 
-  pip3 install sshuttle
-fi
-
-chown -R root:root /root
-chmod -R 600 /root/.ssh

root/etc/services.d/sshvpn/run

@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16