(airavata) branch cybershuttle-staging updated: updated the hub data folder and included pip packages

[lahirujayathilake]

This is an automated email from the ASF dual-hosted git repository.

lahirujayathilake pushed a commit to branch cybershuttle-staging
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/cybershuttle-staging by this 
push:
     new 6e5d934534 updated the hub data folder and included pip packages
6e5d934534 is described below

commit 6e5d93453450ebba35be0c238892be8f3d472476
Author: Lahiru Jayathilake <lahirujayathil...@gmail.com>
AuthorDate: Thu Apr 10 05:20:51 2025 +0530

    updated the hub data folder and included pip packages
---
 .../research-framework/research-hub/compose/jupyterhub_config.py | 2 +-
 .../research-hub/compose/user-container/Dockerfile               | 2 +-
 .../research-hub/compose/user-container/init.sh                  | 9 +++------
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git 
a/modules/research-framework/research-hub/compose/jupyterhub_config.py 
b/modules/research-framework/research-hub/compose/jupyterhub_config.py
index d6d3339154..7bd093d992 100644
--- a/modules/research-framework/research-hub/compose/jupyterhub_config.py
+++ b/modules/research-framework/research-hub/compose/jupyterhub_config.py
@@ -62,7 +62,7 @@ class CustomDockerSpawner(DockerSpawner):
             if data_subfolder:
                 host_data_path = f"/home/exouser/mnt/{data_subfolder}"
                 volumes_dict[host_data_path] = {
-                    'bind': "/home/jovyan/shared_data_tmp",
+                    'bind': f"/cybershuttle_data/{data_subfolder}",
                     'mode': 'ro'
                 }
             self.image = "cybershuttle/jupyterlab-base" # TODO using ENV 
variable
diff --git 
a/modules/research-framework/research-hub/compose/user-container/Dockerfile 
b/modules/research-framework/research-hub/compose/user-container/Dockerfile
index e3197866fc..bc0b4d86dd 100644
--- a/modules/research-framework/research-hub/compose/user-container/Dockerfile
+++ b/modules/research-framework/research-hub/compose/user-container/Dockerfile
@@ -3,11 +3,11 @@ FROM jupyter/base-notebook:latest
 COPY init.sh /usr/local/bin/init.sh
 
 USER root
-RUN pip install ipywidgets
 RUN chmod +x /usr/local/bin/init.sh
 RUN apt-get update && apt-get install -y git
 
 USER $NB_USER
+RUN pip install ipywidgets jupyterlab-git
 
 ENTRYPOINT ["/usr/local/bin/init.sh"]
 CMD ["start-notebook.sh"]
\ No newline at end of file
diff --git 
a/modules/research-framework/research-hub/compose/user-container/init.sh 
b/modules/research-framework/research-hub/compose/user-container/init.sh
index 664146925b..9eb18ec391 100755
--- a/modules/research-framework/research-hub/compose/user-container/init.sh
+++ b/modules/research-framework/research-hub/compose/user-container/init.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 TARGET_DIR="/home/jovyan/work"
-SHARED_TMP="/home/jovyan/shared_data_tmp"
+SHARED_TMP="/cybershuttle_data"
 
 mkdir -p "$TARGET_DIR"
 
@@ -20,12 +20,9 @@ else
     echo "Docker default files already exist, skipping copy."
 fi
 
-# If there's a shared_data_tmp directory mounted, symlink them
 if [ -d "$SHARED_TMP" ]; then
-    echo "Creating symlinks for shared read-only data inside $TARGET_DIR..."
-    for item in "$SHARED_TMP"/*; do
-        ln -s "$item" "$TARGET_DIR/$(basename "$item")"
-    done
+    echo "Linking shared data to workspace..."
+    ln -s "$SHARED_TMP" "$TARGET_DIR/cybershuttle_data"
 fi
 
 exec "$@"