install latests versions of swan-cern and extension

Author: garciagenrique

vre-singleuser-swan-cern/Dockerfile

@@ -1,4 +1,4 @@
-ARG VERSION_PARENT=v0.0.27
+ARG VERSION_PARENT=v0.0.34
 
 FROM gitlab-registry.cern.ch/swan/docker-images/jupyter/swan-cern:${VERSION_PARENT}
 LABEL author="E. Garcia - 2024"
@@ -14,16 +14,12 @@ RUN curl -Lo /etc/yum.repos.d/lcg-trustanchors.repo https://lcg-ca.web.cern.ch/d
 
 USER ${NB_UID}
 
-RUN python -m pip install rucio-clients
-RUN python -m pip install --upgrade typing_extensions
+#RUN python -m pip install rucio-clients
+#RUN python -m pip install --upgrade typing_extensions
 
-#RUN python -m pip install rucio-jupyterlab==1.0.0 \
+#RUN python -m pip install rucio-jupyterlab==1.2.0 \
 RUN git clone https://github.com/rucio/jupyterlab-extension.git \
-    && cd jupyterlab-extension \
-    && python -m pip install . \
-    && jupyter serverextension enable --py rucio_jupyterlab --sys-prefix \
-    && cd .. \
-    && rm -rf jupyterlab-extension
+    && jupyter serverextension enable --py rucio_jupyterlab --sys-prefix 
 
 # Add pre-hooks to be run before the jupyter server starts
 COPY scripts/before-notebook.d/* /usr/local/bin/before-notebook.d/

vre-singleuser-swan-cern/scripts/others/configure_rucio_jupyterlab.py

@@ -5,15 +5,16 @@
 import json
 
 def write_jupyterlab_config():
-    config_jupyterlab = os.environ['JUPYTER_CONFIG_DIR']
-    file_path = config_jupyterlab + '/jupyter_server_config.json'
+    dir_config_jupyterlab = os.getenv('JUPYTER_CONFIG_DIR', 
+                                      os.path.join(os.getenv('HOME'), '.jupyter')
+                                      )
+    file_server_config = os.path.join(dir_config_jupyterlab, 'jupyter_server_config.json')
 
-    if not os.path.isfile(file_path):
-        os.makedirs( config_jupyterlab + '/.jupyter/', exist_ok=True)
-    else:
-        config_file = open(file_path, 'r')
-        config_payload = config_file.read()
-        config_file.close()
+    if not os.path.exists(dir_config_jupyterlab):
+        os.makedirs( dir_config_jupyterlab, exist_ok=True)
+    elif os.path.isfile(file_server_config) :
+        with open(file_server_config, "r") as config_file:
+            config_payload = config_file.read()
 
     try:
         config_json = json.loads(config_payload)
@@ -93,7 +94,7 @@ def write_jupyterlab_config():
         "default_auth_type": os.getenv('RUCIO_DEFAULT_AUTH_TYPE', 'x509_proxy'),
     }
 
-    config_file = open(file_path, 'w')
+    config_file = open(file_server_config, 'w')
     config_file.write(json.dumps(config_json, indent=2))
     config_file.close()
 
@@ -121,6 +122,19 @@ def write_jupyterlab_config():
 #     rucio_config['client'] = client_config
 #     with open('/opt/rucio/etc/rucio.cfg', 'w') as f:
 #         rucio_config.write(f)
+
+# [client]
+# rucio_host = https://vre-rucio.cern.ch
+# auth_host = https://vre-rucio-auth.cern.ch
+# ca_cert = /certs/rucio_ca.pem
+# account = garcia
+# auth_type = oidc
+# oidc_audience = rucio
+# oidc_polling = true
+# oidc_issuer = escape
+# oidc_scope = openid profile offline_access
+# auth_token_file_path = /tmp/rucio_oauth.token
+
 
 if __name__ == '__main__':
     write_jupyterlab_config()