From 4d0beb6c8601da700bb47fce86b78ceb87bac7ea Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 2 Aug 2022 11:14:57 -0400 Subject: [PATCH 1/2] switch to hybrid --- .../dependencies.d/init-mods | 0 .../run | 21 +++++++++++++++++++ .../type | 1 + .../up | 1 + .../init-mod-code-server-nodejs-add-package | 0 .../init-mod-code-server-nodejs-add-package | 0 6 files changed, 23 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-nodejs-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-nodejs-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/run new file mode 100755 index 0000000..cbb1883 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/run @@ -0,0 +1,21 @@ +#!/usr/bin/with-contenv bash + +echo "**** installing nodejs dev environment ****" +if ! dpkg -l | grep gnupg > /dev/null; then + apt-get update && apt-get install -y --no-install-recommends gnupg +fi + +source /etc/lsb-release +[[ ! -f "/etc/apt/sources.list.d/nodesource.list" ]] && \ + curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ + echo "deb https://deb.nodesource.com/node_14.x ${DISTRIB_CODENAME} main" \ + > /etc/apt/sources.list.d/nodesource.list +[[ ! -f "/etc/apt/sources.list.d/yarn.list" ]] && \ + curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ + echo 'deb https://dl.yarnpkg.com/debian/ stable main' \ + > /etc/apt/sources.list.d/yarn.list + +echo "**** Adding nodejs and yarn to package install list ****" +echo "\ + nodejs \ + yarn" >> /mod-repo-packages-to-install.list diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/up new file mode 100644 index 0000000..37abd7a --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-code-server-nodejs-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-nodejs-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-nodejs-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-nodejs-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-nodejs-add-package new file mode 100644 index 0000000..e69de29 From 9df8242712024d981788af4d29e32e6f0b7754a1 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 10 Aug 2022 16:43:01 -0400 Subject: [PATCH 2/2] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 33e4f8b..b92a79a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# Nodejs - Docker mod for code-server +# Nodejs - Docker mod for code-server/openvscode-server -This mod adds a nodejs dev environment to code-server, to be installed/updated during container start. +This mod adds a nodejs dev environment to code-server/openvscode-server, to be installed/updated during container start. -In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-nodejs` +In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-nodejs` If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-nodejs|linuxserver/mods:code-server-mod2` \ No newline at end of file