versioned updates, init cleaned up

.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: "code-server" #replace
+  BASEIMAGE: "code-server"
-  MODNAME: "julia" #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="MateoPeri"
 
-# copy local files
+# Add files from buildstage
-COPY root/ /
+COPY --from=buildstage /root-layer/ /

README.md

@@ -5,3 +5,5 @@ This mod adds a Julia dev environment to code-server, to be installed/updated du
 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:code-server-julia|linuxserver/mods:code-server-mod2`
+
+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`).

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

@@ -1,30 +1,22 @@
 #!/usr/bin/with-contenv bash
 
-gh_latest() {
+if [ -d "/julia-bins" ]; then
-  curl -s https://api.github.com/repos/$1/$2/releases/latest \
+  echo "**** Installing/updating Julia ****"
-    | grep "tag_name" \
+  ARCH=$(uname -m)
-    | cut -d : -f 2,3 \
+  mkdir -p /julia
-    | tr -d '\"\ v,'
+  tar xf "/julia-bins/julia-${ARCH}.tar.gz" -C \
-}
+    /julia --strip-components=1
-
+  rm -rf /usr/local/bin/julia
-# replace these with specific versions if needed (i.e 1.7.2 for Julia)
+  ln -s /julia/bin/julia /usr/local/bin/julia
-JULIA_VERSION=$(gh_latest julialang julia)
+  chmod +x /julia/bin/julia
-
+else
-# Julia
+  echo "**** Latest stable version of Julia already installed ****"
-cd /home/root
+fi
-curl -so julia.tar.gz https://julialang-s3.julialang.org/bin/linux/x64/`echo ${JULIA_VERSION} | cut -d. -f 1,2`/julia-${JULIA_VERSION}-linux-x86_64.tar.gz
-tar fxz julia.tar.gz
-rm -R julia.tar.gz
-ln -s $(pwd)/julia-${JULIA_VERSION}/bin/julia /usr/local/bin/julia
-
 
+echo "**** Installing vscode extensions julia, julia-formatter and better-toml ****"
 # extensions
-install-extension julia-vscode.julia-vscode
+install-extension julialang.language-julia
-# latex-input
-install-extension yellpika.latex-input
-# vscode-format-context-menu
-install-extension lacroixdavid1.vscode-format-context-menu
 # vscode-julia-formatter
 install-extension singularitti.vscode-julia-formatter
 # better-toml
-install-extension bungcip.better-toml
+install-extension bungcip.better-toml