Merge branch 'update_to_v2' into 'main'

Update to v2.0.2

See merge request vsc/vsc-jupyterhub-notebooks!1

.gitignore

+.DS_Store

.gitlab-ci.yml

@@ -9,15 +9,12 @@ variables:
 
 buid-default-notebooks:
   only:
-    # changes:      # changes does not work with variables atm!
-    #   - default/**/*
     refs:
       - tags
   when: manual
   variables:
     VARIANT_PATH: './default'
   script:
-    - ./build_variant.sh $VARIANT_PATH base $CI_COMMIT_TAG
     - ./build_variant.sh $VARIANT_PATH datascience $CI_COMMIT_TAG
     - ./build_variant.sh $VARIANT_PATH minimal $CI_COMMIT_TAG
     - ./build_variant.sh $VARIANT_PATH r $CI_COMMIT_TAG
@@ -26,8 +23,6 @@ buid-default-notebooks:
 
 buid-gpu-jupyter:
   only:
-    # changes:      # changes does not work with variables atm!
-    #   - gpu-jupyter/**/*
     refs:
       - tags
   when: manual

default/base.def

-BootStrap: docker
-From: jupyter/base-notebook:hub-1.5.0
-
-%post
-/opt/conda/bin/pip install batchspawner==1.1.0
\ No newline at end of file

default/base.meta

-{
-    "title": "Base Notebook ({group})",
-    "description": "Base image of the jupyter docker core stacks containing python3",
-    "link": "https://github.com/jupyter/docker-stacks",
-    "version": "hub-1.5.0",
-    "author": "VSC",
-    "contact": "service@vsc.ac.at",
-    "required-caps": [],
-    "exclude-caps": ["gpu"]
-}
\ No newline at end of file

default/datascience.def

 BootStrap: docker
-From: jupyter/datascience-notebook:hub-1.5.0
+From: jupyter/datascience-notebook:hub-2.0.2
+
+%files
+requirements.txt /home/joyvan/requirements.txt
+install-packages.sh /home/joyvan/install-packages.sh
 
 %post
-/opt/conda/bin/pip install batchspawner==1.1.0
+/usr/bin/bash /home/joyvan/install-packages.sh
+rm -f /home/joyvan/requirements.txt
+rm -f /home/joyvan/install-packages.txt

default/datascience.meta

@@ -2,7 +2,7 @@
     "title": "Datascience Notebook ({group})",
     "description": "The Datascience image contains everything from 'SciPy' & 'R' as well as an Julia environment.",
     "link": "https://github.com/jupyter/docker-stacks",
-    "version": "hub-1.5.0",
+    "version": "hub-2.0.2",
     "author": "VSC",
     "contact": "service@vsc.ac.at",
     "required-caps": [],

default/install-packages.sh

+#/usr/bin/env bash
+
+# this is only needed for the base image - all other images have git
+# /usr/bin/apt update 
+# /usr/bin/apt -y install git 
+/usr/bin/apt -y autoremove 
+/usr/bin/apt-get -y clean
+
+/opt/conda/bin/pip install -r /home/joyvan/requirements.txt

default/minimal.def

 BootStrap: docker
-From: jupyter/minimal-notebook:hub-1.5.0
+From: jupyter/minimal-notebook:hub-2.0.2
+
+%files
+requirements.txt /home/joyvan/requirements.txt
+install-packages.sh /home/joyvan/install-packages.sh
 
 %post
-/opt/conda/bin/pip install batchspawner==1.1.0
\ No newline at end of file
+/usr/bin/bash /home/joyvan/install-packages.sh
+rm -f /home/joyvan/requirements.txt
+rm -f /home/joyvan/install-packages.txt
\ No newline at end of file

default/minimal.meta

@@ -2,7 +2,7 @@
     "title": "Minimal Notebook ({group})",
     "description": "Minimal image contains everything from 'base' as well as TeX Live",
     "link": "https://github.com/jupyter/docker-stacks",
-    "version": "hub-1.5.0",
+    "version": "hub-2.0.2",
     "author": "VSC",
     "contact": "service@vsc.ac.at",
     "required-caps": [],

default/r.def

 BootStrap: docker
-From: jupyter/r-notebook:hub-1.5.0
+From: jupyter/r-notebook:hub-2.0.2
+
+%files
+requirements.txt /home/joyvan/requirements.txt
+install-packages.sh /home/joyvan/install-packages.sh
 
 %post
-/opt/conda/bin/pip install batchspawner==1.1.0
\ No newline at end of file
+/usr/bin/bash /home/joyvan/install-packages.sh
+rm -f /home/joyvan/requirements.txt
+rm -f /home/joyvan/install-packages.txt
\ No newline at end of file

default/r.meta

@@ -2,7 +2,7 @@
     "title": "R Notebook ({group})",
     "description": "R image contains everything from 'minimal' as well as the R interpreter and base environment.",
     "link": "https://github.com/jupyter/docker-stacks",
-    "version": "hub-1.5.0",
+    "version": "hub-2.0.2",
     "author": "VSC",
     "contact": "service@vsc.ac.at",
     "required-caps": [],

default/requirements.txt

+batchspawner==1.1.0
+# slurm package only works if we have slurm tools as well
+# in the singularity image - so skip it for now
+#jupyterlab-slurm==3.0.1
+jupyterlab-system-monitor==0.8.0
+jupyterlab-git==0.34.2
+jupyterlab-widgets==1.0.2
\ No newline at end of file

default/scipy.def

 BootStrap: docker
-From: jupyter/scipy-notebook:hub-1.5.0
+From: jupyter/scipy-notebook:hub-2.0.2
+
+%files
+requirements.txt /home/joyvan/requirements.txt
+install-packages.sh /home/joyvan/install-packages.sh
 
 %post
-/opt/conda/bin/pip install batchspawner==1.1.0
\ No newline at end of file
+/usr/bin/bash /home/joyvan/install-packages.sh
+rm -f /home/joyvan/requirements.txt
+rm -f /home/joyvan/install-packages.txt
\ No newline at end of file

default/scipy.meta

@@ -2,7 +2,7 @@
     "title": "SciPy Notebook ({group})",
     "description": "The SciPy image contains everything from 'minimal' and popular packages from the scientific Python ecosystem.",
     "link": "https://github.com/jupyter/docker-stacks",
-    "version": "hub-1.5.0",
+    "version": "hub-2.0.2",
     "author": "VSC",
     "contact": "service@vsc.ac.at",
     "required-caps": [],

default/tensorflow.def

 BootStrap: docker
-From: jupyter/tensorflow-notebook:hub-1.5.0
+From: jupyter/tensorflow-notebook:hub-2.0.2
+
+%files
+requirements.txt /home/joyvan/requirements.txt
+install-packages.sh /home/joyvan/install-packages.sh
 
 %post
-/opt/conda/bin/pip install batchspawner==1.1.0
\ No newline at end of file
+/usr/bin/bash /home/joyvan/install-packages.sh
+rm -f /home/joyvan/requirements.txt
+rm -f /home/joyvan/install-packages.txt
\ No newline at end of file

default/tensorflow.meta

@@ -2,7 +2,7 @@
     "title": "Tensorflow Notebook ({group})",
     "description": "The Tensorflow image contains everything from 'SciPy' as well as the tensorflow machine learning library.",
     "link": "https://github.com/jupyter/docker-stacks",
-    "version": "hub-1.5.0",
+    "version": "hub-2.0.2",
     "author": "VSC",
     "contact": "service@vsc.ac.at",
     "required-caps": [],