Merge pull request #428 from linuxserver/code-server-scikit-learn-s6v3

switch to hybrid (code-server-scikit-learn)

README.md

@@ -1,7 +1,7 @@
-# scikit-learn - Docker mod for code-server
+# scikit-learn - Docker mod for code-server/openvscode-server
 
-This mod adds `scikit-learn` and `jupyter` to code-server, to be installed/updated during container start.
+This mod adds `scikit-learn` and `jupyter` 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-scikit-learn`
+In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-scikit-learn`
 
 If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-scikit-learn|linuxserver/mods:code-server-prolog`

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/run

@@ -0,0 +1,17 @@
+#!/usr/bin/with-contenv bash
+
+if ! pip list 2> /dev/null | grep -q "scikit-learn"; then
+    echo "**** Adding scikit-learn and deps to package install lists ****"
+    echo "\
+        build-essential \
+        libssl-dev \
+        libffi-dev \
+        python3-dev \
+        python3-pip \
+        python3-venv" >> /mod-repo-packages-to-install.list
+    echo "\
+        jupyterlab\
+        scikit-learn" >> /mod-pip-packages-to-install.list
+else
+    echo "**** scikit-learn already installed, skipping ****"
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/run