From e30a4a9fdbee08f3d0a7d236d3aaea37c8e3d6a7 Mon Sep 17 00:00:00 2001 From: MateoPeri Date: Thu, 10 Feb 2022 23:02:24 +0000 Subject: [PATCH 1/7] code-server:julia initial commit --- .github/workflows/BuildImage.yml | 4 +-- Dockerfile | 2 +- Dockerfile.complex | 23 -------------- README.md | 26 +++------------ root/etc/cont-init.d/98-julia | 51 ++++++++++++++++++++++++++++++ root/etc/cont-init.d/98-vpn-config | 27 ---------------- 6 files changed, 58 insertions(+), 75 deletions(-) delete mode 100644 Dockerfile.complex create mode 100644 root/etc/cont-init.d/98-julia delete mode 100644 root/etc/cont-init.d/98-vpn-config diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 518b0d8..5e0ebc4 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -4,8 +4,8 @@ on: [push, pull_request, workflow_dispatch] env: ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "replace_baseimage" #replace - MODNAME: "replace_modname" #replace + BASEIMAGE: "code-server" #replace + MODNAME: "julia" #replace jobs: build: diff --git a/Dockerfile b/Dockerfile index 4ece5e8..a7dda39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="MateoPeri" # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index db4598e..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -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/ / diff --git a/README.md b/README.md index 761c799..5f45502 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,7 @@ -# 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` - -# Mod creation instructions - -* 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 `-`. 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) +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` diff --git a/root/etc/cont-init.d/98-julia b/root/etc/cont-init.d/98-julia new file mode 100644 index 0000000..217be08 --- /dev/null +++ b/root/etc/cont-init.d/98-julia @@ -0,0 +1,51 @@ +#!/usr/bin/with-contenv bash + +gh_lates() { + curl -s https://api.github.com/repos/$1/$2/releases/latest \ + | grep "tag_name" \ + | cut -d : -f 2,3 \ + | tr -d '\"\ v,' +} + +download_vsix() { + wget -qO $1.$2-$3.vsix https://$1.gallery.vsassets.io/_apis/public/gallery/publisher/$1/extension/$2/$3/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage +} + +# replace these with specific versions if needed (i.e 1.7.2 for Julia) +JULIA_VERSION=$(gh_latest julialang julia) +JULIA_VSCODE_VERSION=$(gh_latest julia-vscode julia-vscode) +VSCODE_FORMAT_VERSION=1.0.4 +JULIA_FORMATTER_VERSION=$(gh_latest singularitti vscode-julia-formatter) +ANACONDA_VERSION=latest + +# Julia +cd /usr/local/bin \ + && sudo mkdir julia_dir \ + && cd julia_dir \ + && sudo wget -q -q https://julialang-s3.julialang.org/bin/linux/x64/`echo ${JULIA_VERSION} | cut -d. -f 1,2`/julia-${JULIA_VERSION}-linux-x86_64.tar.gz \ + && sudo tar fxz julia-${JULIA_VERSION}-linux-x86_64.tar.gz \ + && sudo rm -R julia-${JULIA_VERSION}-linux-x86_64.tar.gz \ + && cd .. \ + && sudo ln -s julia_dir/julia-${JULIA_VERSION}/bin/julia julia + + +RUN cd /home/coder/project/ \ + && sudo wget -q https://github.com/julia-vscode/julia-vscode/releases/download/v${JULIA_VSCODE_VERSION}/language-julia-${JULIA_VSCODE_VERSION}.vsix \ + && code-server --install-extension language-julia-${JULIA_VSCODE_VERSION}.vsix \ + && sudo rm language-julia-${JULIA_VSCODE_VERSION}.vsix \ + # latex-input + #&& code-server --install-extension yellpika.latex-input \ + # vscode-format-context-menu + && download_vsix lacroixdavid1 vscode-format-context-menu ${VSCODE_FORMAT_VERSION} \ + && code-server --install-extension lacroixdavid1.vscode-format-context-menu-${VSCODE_FORMAT_VERSION}.vsix \ + && sudo rm lacroixdavid1.vscode-format-context-menu-${VSCODE_FORMAT_VERSION}.vsix \ + # vscode-julia-formatter + && download_vsix singularitti vscode-julia-formatter ${JULIA_FORMATTER_VERSION} \ + && code-server --install-extension singularitti.vscode-julia-formatter-${JULIA_FORMATTER_VERSION}.vsix \ + && sudo rm singularitti.vscode-julia-formatter-${JULIA_FORMATTER_VERSION}.vsix + # better-toml + #&& code-server --install-extension bungcip.better-toml + + +chown -R root:root /root +chmod -R 600 /root/.ssh diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index a5f9127..0000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -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 From bec9dcb3ea790707d08cc23b4c1715286e772d18 Mon Sep 17 00:00:00 2001 From: MateoPeri Date: Fri, 11 Feb 2022 10:56:54 +0000 Subject: [PATCH 2/7] code-server:julia fixed sudo & julia bin --- root/etc/cont-init.d/98-julia | 45 ++++++++++++++++------------------ root/etc/services.d/sshvpn/run | 3 --- 2 files changed, 21 insertions(+), 27 deletions(-) delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/root/etc/cont-init.d/98-julia b/root/etc/cont-init.d/98-julia index 217be08..6a79fa2 100644 --- a/root/etc/cont-init.d/98-julia +++ b/root/etc/cont-init.d/98-julia @@ -19,32 +19,29 @@ JULIA_FORMATTER_VERSION=$(gh_latest singularitti vscode-julia-formatter) ANACONDA_VERSION=latest # Julia -cd /usr/local/bin \ - && sudo mkdir julia_dir \ - && cd julia_dir \ - && sudo wget -q -q https://julialang-s3.julialang.org/bin/linux/x64/`echo ${JULIA_VERSION} | cut -d. -f 1,2`/julia-${JULIA_VERSION}-linux-x86_64.tar.gz \ - && sudo tar fxz julia-${JULIA_VERSION}-linux-x86_64.tar.gz \ - && sudo rm -R julia-${JULIA_VERSION}-linux-x86_64.tar.gz \ - && cd .. \ - && sudo ln -s julia_dir/julia-${JULIA_VERSION}/bin/julia julia +wget -q -q 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-${JULIA_VERSION}-linux-x86_64.tar.gz +rm -R julia-${JULIA_VERSION}-linux-x86_64.tar.gz +mv julia-${JULIA_VERSION}/bin/julia /usr/local/bin -RUN cd /home/coder/project/ \ - && sudo wget -q https://github.com/julia-vscode/julia-vscode/releases/download/v${JULIA_VSCODE_VERSION}/language-julia-${JULIA_VSCODE_VERSION}.vsix \ - && code-server --install-extension language-julia-${JULIA_VSCODE_VERSION}.vsix \ - && sudo rm language-julia-${JULIA_VSCODE_VERSION}.vsix \ - # latex-input - #&& code-server --install-extension yellpika.latex-input \ - # vscode-format-context-menu - && download_vsix lacroixdavid1 vscode-format-context-menu ${VSCODE_FORMAT_VERSION} \ - && code-server --install-extension lacroixdavid1.vscode-format-context-menu-${VSCODE_FORMAT_VERSION}.vsix \ - && sudo rm lacroixdavid1.vscode-format-context-menu-${VSCODE_FORMAT_VERSION}.vsix \ - # vscode-julia-formatter - && download_vsix singularitti vscode-julia-formatter ${JULIA_FORMATTER_VERSION} \ - && code-server --install-extension singularitti.vscode-julia-formatter-${JULIA_FORMATTER_VERSION}.vsix \ - && sudo rm singularitti.vscode-julia-formatter-${JULIA_FORMATTER_VERSION}.vsix - # better-toml - #&& code-server --install-extension bungcip.better-toml +# extensions +cd /home/coder/project/ +wget -q https://github.com/julia-vscode/julia-vscode/releases/download/v${JULIA_VSCODE_VERSION}/language-julia-${JULIA_VSCODE_VERSION}.vsix \ +code-server --install-extension language-julia-${JULIA_VSCODE_VERSION}.vsix \ +rm language-julia-${JULIA_VSCODE_VERSION}.vsix \ +# latex-input +code-server --install-extension yellpika.latex-input \ +# vscode-format-context-menu +download_vsix lacroixdavid1 vscode-format-context-menu ${VSCODE_FORMAT_VERSION} \ +code-server --install-extension lacroixdavid1.vscode-format-context-menu-${VSCODE_FORMAT_VERSION}.vsix \ +rm lacroixdavid1.vscode-format-context-menu-${VSCODE_FORMAT_VERSION}.vsix \ +# vscode-julia-formatter +download_vsix singularitti vscode-julia-formatter ${JULIA_FORMATTER_VERSION} \ +code-server --install-extension singularitti.vscode-julia-formatter-${JULIA_FORMATTER_VERSION}.vsix \ +rm singularitti.vscode-julia-formatter-${JULIA_FORMATTER_VERSION}.vsix +# better-toml +#code-server --install-extension bungcip.better-toml chown -R root:root /root diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run deleted file mode 100644 index 7d49e79..0000000 --- a/root/etc/services.d/sshvpn/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16 From b95795e7f65b5be13ef616e80a60d569b175be03 Mon Sep 17 00:00:00 2001 From: MateoPeri Date: Fri, 11 Feb 2022 14:18:08 +0000 Subject: [PATCH 3/7] code-server:julia extension helper --- root/etc/cont-init.d/98-julia | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/root/etc/cont-init.d/98-julia b/root/etc/cont-init.d/98-julia index 6a79fa2..9275ec1 100644 --- a/root/etc/cont-init.d/98-julia +++ b/root/etc/cont-init.d/98-julia @@ -1,22 +1,14 @@ #!/usr/bin/with-contenv bash -gh_lates() { +gh_latest() { curl -s https://api.github.com/repos/$1/$2/releases/latest \ | grep "tag_name" \ | cut -d : -f 2,3 \ | tr -d '\"\ v,' } -download_vsix() { - wget -qO $1.$2-$3.vsix https://$1.gallery.vsassets.io/_apis/public/gallery/publisher/$1/extension/$2/$3/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage -} - # replace these with specific versions if needed (i.e 1.7.2 for Julia) JULIA_VERSION=$(gh_latest julialang julia) -JULIA_VSCODE_VERSION=$(gh_latest julia-vscode julia-vscode) -VSCODE_FORMAT_VERSION=1.0.4 -JULIA_FORMATTER_VERSION=$(gh_latest singularitti vscode-julia-formatter) -ANACONDA_VERSION=latest # Julia wget -q -q https://julialang-s3.julialang.org/bin/linux/x64/`echo ${JULIA_VERSION} | cut -d. -f 1,2`/julia-${JULIA_VERSION}-linux-x86_64.tar.gz @@ -26,22 +18,15 @@ mv julia-${JULIA_VERSION}/bin/julia /usr/local/bin # extensions -cd /home/coder/project/ -wget -q https://github.com/julia-vscode/julia-vscode/releases/download/v${JULIA_VSCODE_VERSION}/language-julia-${JULIA_VSCODE_VERSION}.vsix \ -code-server --install-extension language-julia-${JULIA_VSCODE_VERSION}.vsix \ -rm language-julia-${JULIA_VSCODE_VERSION}.vsix \ +install-extension julia-vscode.julia-vscode # latex-input -code-server --install-extension yellpika.latex-input \ +install-extension yellpika.latex-input # vscode-format-context-menu -download_vsix lacroixdavid1 vscode-format-context-menu ${VSCODE_FORMAT_VERSION} \ -code-server --install-extension lacroixdavid1.vscode-format-context-menu-${VSCODE_FORMAT_VERSION}.vsix \ -rm lacroixdavid1.vscode-format-context-menu-${VSCODE_FORMAT_VERSION}.vsix \ +install-extension lacroixdavid1.vscode-format-context-menu # vscode-julia-formatter -download_vsix singularitti vscode-julia-formatter ${JULIA_FORMATTER_VERSION} \ -code-server --install-extension singularitti.vscode-julia-formatter-${JULIA_FORMATTER_VERSION}.vsix \ -rm singularitti.vscode-julia-formatter-${JULIA_FORMATTER_VERSION}.vsix +install-extension singularitti.vscode-julia-formatter # better-toml -#code-server --install-extension bungcip.better-toml +install-extension bungcip.better-toml chown -R root:root /root From d0368b838d7dc3a7bfa1b3eb6f67ff3c96ebef35 Mon Sep 17 00:00:00 2001 From: MateoPeri Date: Fri, 11 Feb 2022 14:28:51 +0000 Subject: [PATCH 4/7] code-server:julia replaced wget with curl --- root/etc/cont-init.d/98-julia | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root/etc/cont-init.d/98-julia b/root/etc/cont-init.d/98-julia index 9275ec1..c48ed82 100644 --- a/root/etc/cont-init.d/98-julia +++ b/root/etc/cont-init.d/98-julia @@ -11,9 +11,9 @@ gh_latest() { JULIA_VERSION=$(gh_latest julialang julia) # Julia -wget -q -q 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-${JULIA_VERSION}-linux-x86_64.tar.gz -rm -R julia-${JULIA_VERSION}-linux-x86_64.tar.gz +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 mv julia-${JULIA_VERSION}/bin/julia /usr/local/bin From b1d9c71726dd67d32103f98fef10a60bfee5ec77 Mon Sep 17 00:00:00 2001 From: MateoPeri Date: Fri, 11 Feb 2022 14:35:58 +0000 Subject: [PATCH 5/7] code-server:julia replaced removed permission changes --- root/etc/cont-init.d/98-julia | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/root/etc/cont-init.d/98-julia b/root/etc/cont-init.d/98-julia index c48ed82..63f8962 100644 --- a/root/etc/cont-init.d/98-julia +++ b/root/etc/cont-init.d/98-julia @@ -26,8 +26,4 @@ install-extension lacroixdavid1.vscode-format-context-menu # vscode-julia-formatter install-extension singularitti.vscode-julia-formatter # better-toml -install-extension bungcip.better-toml - - -chown -R root:root /root -chmod -R 600 /root/.ssh +install-extension bungcip.better-toml \ No newline at end of file From 2e3e95e194f7fed2a2ebd2a5b083954e0059c438 Mon Sep 17 00:00:00 2001 From: MateoPeri Date: Fri, 11 Feb 2022 15:13:54 +0000 Subject: [PATCH 6/7] code-server:julia changed julia install --- root/etc/cont-init.d/98-julia | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/98-julia b/root/etc/cont-init.d/98-julia index 63f8962..277a7d5 100644 --- a/root/etc/cont-init.d/98-julia +++ b/root/etc/cont-init.d/98-julia @@ -11,10 +11,11 @@ gh_latest() { JULIA_VERSION=$(gh_latest julialang julia) # Julia +cd /home/root 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 -mv julia-${JULIA_VERSION}/bin/julia /usr/local/bin +ln -s $(pwd)/julia-${JULIA_VERSION}/bin/julia /usr/local/bin/julia # extensions From eab09ae1b3c777ca4ff6be9d28ac90dd0a64acd1 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 11 Feb 2022 13:30:05 -0500 Subject: [PATCH 7/7] versioned updates, init cleaned up --- .github/workflows/BuildImage.yml | 19 ++++++++++++---- Dockerfile | 35 +++++++++++++++++++++++++++-- README.md | 2 ++ root/etc/cont-init.d/98-julia | 38 +++++++++++++------------------- 4 files changed, 65 insertions(+), 29 deletions(-) diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 5e0ebc4..4a5d056 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -3,9 +3,9 @@ name: Build Image on: [push, pull_request, workflow_dispatch] env: - ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "code-server" #replace - MODNAME: "julia" #replace + ENDPOINT: "linuxserver/mods" + BASEIMAGE: "code-server" + 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} diff --git a/Dockerfile b/Dockerfile index a7dda39..50b01bd 100644 --- a/Dockerfile +++ b/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 -COPY root/ / +# Add files from buildstage +COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index 5f45502..06b28d8 100644 --- a/README.md +++ b/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`). diff --git a/root/etc/cont-init.d/98-julia b/root/etc/cont-init.d/98-julia index 277a7d5..d7807a3 100644 --- a/root/etc/cont-init.d/98-julia +++ b/root/etc/cont-init.d/98-julia @@ -1,30 +1,22 @@ #!/usr/bin/with-contenv bash -gh_latest() { - curl -s https://api.github.com/repos/$1/$2/releases/latest \ - | grep "tag_name" \ - | cut -d : -f 2,3 \ - | tr -d '\"\ v,' -} - -# replace these with specific versions if needed (i.e 1.7.2 for Julia) -JULIA_VERSION=$(gh_latest julialang julia) - -# Julia -cd /home/root -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 - +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 julia-vscode.julia-vscode -# latex-input -install-extension yellpika.latex-input -# vscode-format-context-menu -install-extension lacroixdavid1.vscode-format-context-menu +install-extension julialang.language-julia # vscode-julia-formatter install-extension singularitti.vscode-julia-formatter # better-toml -install-extension bungcip.better-toml \ No newline at end of file +install-extension bungcip.better-toml