From 568b34dad7c313a988f877ec0a37c729cc982e65 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 10 Aug 2022 15:45:41 -0400
Subject: [PATCH] switch to hybrid

---
 README.md                                       |  6 +++---
 .../dependencies.d/init-mods                    |  0
 .../run                                         | 17 +++++++++++++++++
 .../type                                        |  1 +
 .../up                                          |  1 +
 ...nit-mod-code-server-scikit-learn-add-package |  0
 ...nit-mod-code-server-scikit-learn-add-package |  0
 7 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/dependencies.d/init-mods
 create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/run
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/type
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/up
 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-scikit-learn-add-package
 create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-scikit-learn-add-package

diff --git a/README.md b/README.md
index 4a54136..16a42ae 100644
--- a/README.md
+++ b/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`
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-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-scikit-learn-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/run
new file mode 100755
index 0000000..3af5816
--- /dev/null
+++ b/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>&1 | 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
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-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-scikit-learn-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-scikit-learn-add-package/up
new file mode 100644
index 0000000..6fba1e4
--- /dev/null
+++ b/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
\ 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-scikit-learn-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-scikit-learn-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-scikit-learn-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-scikit-learn-add-package
new file mode 100644
index 0000000..e69de29