From e30a4a9fdbee08f3d0a7d236d3aaea37c8e3d6a7 Mon Sep 17 00:00:00 2001 From: MateoPeri Date: Thu, 10 Feb 2022 23:02:24 +0000 Subject: [PATCH] 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