Merge branch 'main' into 'temp-fix-permissions'

# Conflicts:
#   extraFiles/my_spawner.py

extraFiles/my_spawner.py

@@ -108,9 +108,20 @@ class MySpawner(KubeSpawner):
             'display_name': 'Stack Minimal',
         },
         {
-            'display_name': 'Stack Minimal + Desktop GUI',
+            'display_name': 'Stack Minimal + Desktop GUI + Relion + Blender',
             'kubespawner_override': {
-                'image_spec': 'gitlab-registry.nrp-nautilus.io/youngsu_kim/csusb-jupyter-stack/stack-temp-desktop',
+                'image': 'localhost:30081/prp/jupyter-stack/relion-desktop',
+                'lifecycle_hooks': {
+                    'postStart': {
+                        'exec': {
+                            'command': [
+                                'sh',
+                                '-c',
+                                '/home/jovyan/shared/.software/prog-desktop.sh || true',
+                            ]
+                        }
+                    }
+                }
             }
         },
         {
@@ -140,7 +151,7 @@ class MySpawner(KubeSpawner):
         {
             'display_name': 'Stack R-Studio',
             'kubespawner_override': {
-                'image_spec': 'gitlab-registry.nrp-nautilus.io/youngsu_kim/csusb-jupyter-stack/stack-rstudio-becerra-class',
+                'image_spec': 'gitlab-registry.nrp-nautilus.io/youngsu_kim/csusb-jupyter-stack/r-studio',
             }
         },
         {