jupyterlab working on osg via singularity container!

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
tunel-apps · Jul 6, 2022 · 16ba2b8 · 16ba2b8
1 parent 6601115
commit 16ba2b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/tunel/apps/singularity/socket/jupyter/app.yaml b/tunel/apps/singularity/socket/jupyter/app.yaml
@@ -4,6 +4,8 @@ needs:
   socket: true
 examples:
   - tunel run-app waffles singularity/socket/jupyter --container=docker://jupyter/datascience-notebook
+ # Run Jupyterlab login node (via Singularity container) on open science grid
+  - tunel run-app osg singularity/socket/jupyter --jupyterlab=true
 args:
  # Change jupyter container used (default is datascience notebook)
  # must start with container URI to pull (e.g., docker://)

diff --git a/tunel/apps/singularity/socket/jupyter/jupyter.sh b/tunel/apps/singularity/socket/jupyter/jupyter.sh
@@ -46,8 +46,8 @@ then
     # In case they don't exist yet
     mkdir -p $HOME/.jupyter
 
-    printf "singularity exec --home ${HOME} --bind ${HOME}/.local:/home/jovyan/.local ${CONTAINER} jupyter notebook --no-browser --sock ${SOCKET}\n"
-    singularity exec {% if args.jupyterlab %}--env JUPYTER_ENABLE_LAB=yes{% endif %} --home ${HOME} --bind ${HOME}/.local:/home/jovyan/.local --bind ${HOME}/.jupyter:/home/jovyan/.jupyter "${SIF}" jupyter notebook --no-browser --sock ${SOCKET}
+    printf "singularity exec {% if args.jupyterlab %}--env JUPYTER_ENABLE_LAB=yes{% endif %} --home ${HOME} --bind ${HOME}/.local:/home/jovyan/.local ${CONTAINER} jupyter {% if args.jupyterlab %}lab{% else %}notebook{% endif %} --no-browser --sock ${SOCKET}\n"
+    singularity exec {% if args.jupyterlab %}--env JUPYTER_ENABLE_LAB=yes{% endif %} --home ${HOME} --bind ${HOME}/.local:/home/jovyan/.local --bind ${HOME}/.jupyter:/home/jovyan/.jupyter "${SIF}" jupyter {% if args.jupyterlab %}lab{% else %}notebook{% endif %} --no-browser --sock ${SOCKET}
 else
     printf "Singularity is not available.\n"
 fi
diff --git a/tunel/launcher/slurm.py b/tunel/launcher/slurm.py
@@ -112,7 +112,7 @@ def run_app(self, app):
             "--output=%s.out" % render["log_output"],
             "--error=%s.err" % render["log_error"],
             remote_script,
-        ] + render.get("args", [])
+        ]
 
         # Launch with command
         if not self.previous_job_exists(app.job_name):