From 8a269aa62ec8b2c7ea16ffb455a3cf7630458bc7 Mon Sep 17 00:00:00 2001 From: MiguelNdeCarvalho Date: Wed, 21 Oct 2020 19:12:41 +0100 Subject: [PATCH 1/2] Add zsh mod for code-server --- .travis.yml | 10 +++++----- Dockerfile | 2 +- Dockerfile.complex | 23 ----------------------- README.md | 18 ++++-------------- root/etc/cont-init.d/98-vpn-config | 27 --------------------------- root/etc/cont-init.d/98-zsh | 12 ++++++++++++ root/etc/services.d/sshvpn/run | 3 --- 7 files changed, 22 insertions(+), 73 deletions(-) delete mode 100644 Dockerfile.complex delete mode 100644 root/etc/cont-init.d/98-vpn-config create mode 100644 root/etc/cont-init.d/98-zsh delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/.travis.yml b/.travis.yml index e6e5b1f..1988078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,16 +4,16 @@ language: shell branches: only: - - - #replace variables, omit brackets + - code-server-zsh services: - docker env: global: - - DOCKERHUB="linuxserver/mods" #don't modify - - BASEIMAGE="baseimagename" #replace - - MODNAME="modname" #replace + - DOCKERHUB="linuxserver/mods" + - BASEIMAGE="code-server" + - MODNAME="zsh" jobs: include: @@ -32,4 +32,4 @@ jobs: - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin # Push all of the tags - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} - - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} \ No newline at end of file + - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} diff --git a/Dockerfile b/Dockerfile index 4ece5e8..62f8796 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="MiguelNdeCarvalho" # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index bc97902..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,23 +0,0 @@ -## Buildstage ## -FROM lsiobase/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 62f203f..fe2dea0 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,7 @@ -# Rsync - Docker mod for openssh-server +# Prolog - Docker mod for code-server -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod adds `zsh` 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-zsh` -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 `travis.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. +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-zsh|linuxserver/mods:code-server-prolog` 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 diff --git a/root/etc/cont-init.d/98-zsh b/root/etc/cont-init.d/98-zsh new file mode 100644 index 0000000..4479221 --- /dev/null +++ b/root/etc/cont-init.d/98-zsh @@ -0,0 +1,12 @@ +#!/usr/bin/with-contenv bash + +# First install ZSH +apt-get update && apt-get install -y \ + zsh + +# Install oh-my-zsh +sudo -u abc "git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh" +sudo -u abc "cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc" + +# Setup shell as default +chsh -s $(which zsh) abc 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 4cd7a0b7062715fe429a982d6d4cf06de6d73853 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 22 Oct 2020 09:55:58 -0400 Subject: [PATCH 2/2] grab ohmyzsh during build time, check for install --- Dockerfile | 14 ++++++++++++-- README.md | 6 ++++-- root/etc/cont-init.d/98-zsh | 21 +++++++++++++++------ 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 62f8796..c946fb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,16 @@ +FROM lsiobase/alpine:3.12 as buildstage + +RUN \ + apk add --no-cache \ + git && \ + git clone https://github.com/ohmyzsh/ohmyzsh.git /root-layer/.oh-my-zsh + +COPY root/ /root-layer/ + +# runtime stage FROM scratch LABEL maintainer="MiguelNdeCarvalho" -# copy local files -COPY root/ / +# Add files from buildstage +COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index fe2dea0..a975981 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ -# Prolog - Docker mod for code-server +# Zsh / Oh My Zsh - Docker mod for code-server -This mod adds `zsh` to code-server, to be installed/updated during container start. +This mod adds `zsh` and `Oh My Zsh` to code-server, to be installed/updated during container start. In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-zsh` If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-zsh|linuxserver/mods:code-server-prolog` + +`Oh My Zsh` is installed at `/config/.oh-my-zsh` and can be updated via `omz update` in terminal. diff --git a/root/etc/cont-init.d/98-zsh b/root/etc/cont-init.d/98-zsh index 4479221..284050e 100644 --- a/root/etc/cont-init.d/98-zsh +++ b/root/etc/cont-init.d/98-zsh @@ -1,12 +1,21 @@ #!/usr/bin/with-contenv bash -# First install ZSH +# Install ZSH +echo "**** Installing zsh ****" apt-get update && apt-get install -y \ zsh -# Install oh-my-zsh -sudo -u abc "git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh" -sudo -u abc "cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc" +# Install oh-my-zsh if not installed already +if [ -d /config/.oh-my-zsh ]; then + echo "**** Oh My Zsh is already installed. You can update it via \"omz update\" in terminal. ****" +elif [ -d /.oh-my-zsh ]; then + echo "**** Installing Oh My Zsh. You can update it via \"omz update\" in terminal. ****" + mv /.oh-my-zsh /config/.oh-my-zsh + cp /config/.oh-my-zsh/templates/zshrc.zsh-template /config/.zshrc +else + echo "**** It looks like Oh My Zsh was manually deleted after install. Please recreate the code-server container to reinstall Oh My Zsh. ****" +fi -# Setup shell as default -chsh -s $(which zsh) abc +chown -R abc:abc \ + /config/.oh-my-zsh \ + /config/.zshrc