Skip to content

Commit 7ad0b29

Browse files
Soap2Ggarciagenrique
authored andcommitted
fix: include gfal2 full dependencies from conda-forge (#87)
feat(ENV:vre-swan-cern) build latest version
1 parent 35e075a commit 7ad0b29

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

vre-singleuser-py311/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ USER $NB_UID
1111

1212
RUN conda install -y -n base mamba \
1313
&& mamba install -y -c conda-forge python-gfal2 \
14+
gfal2 \
15+
gfal2-util \
1416
nodejs \
1517
jupyterlab">4,<5" \
1618
notebook"<7" \

vre-swan-cern/Dockerfile

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#FROM gitlab-registry.cern.ch/swan/docker-images/jupyter/swan:${VERSION_PARENT}
33
# Same image as swan-cern/v0.0.48 - VRE-ied
44

5-
ARG VERSION_PARENT=sha-8b00ce5
5+
ARG VERSION_PARENT=sha-d611be0
66
FROM ghcr.io/vre-hub/vre-swan:${VERSION_PARENT}
77

88
LABEL maintainer="swan-admins@cern.ch"
@@ -29,13 +29,7 @@ RUN pip install --no-deps --no-cache-dir \
2929
swandask==0.0.5
3030

3131
# CERN-VRE
32-
#RUN pip install rucio-jupyterlab==1.2.0 --no-cache-dir
33-
RUN git clone https://github.com/Soap2G/jupyterlab-extension.git \
34-
&& cd jupyterlab-extension \
35-
&& git checkout gguerrie-API-refactoring \
36-
&& pip install . \
37-
&& cd .. \
38-
&& rm -rf jupyterlab-extension
32+
RUN pip install --no-deps --no-cache-dir rucio-jupyterlab==1.3.1
3933

4034
# Install swandaskcluster in the lib directory that is exposed to notebooks and
4135
# terminals, which need it to do automatic TLS configuration for Dask clients
@@ -84,8 +78,8 @@ RUN ln -s $(pip show sparkconnector | grep -oP 'Location: \K.*')/sparkconnector
8478

8579
# CERN-VRE
8680
# The fact that the rucio_jupyterlab does not correspond with rucio-jupyterlab is how the package was dev
87-
RUN ln -s $(pip show rucio-jupyterlab | grep -oP 'Location: \K.*')/rucio_jupyterlab ${SWAN_LIB_DIR}/nb_term_lib
88-
RUN jupyter serverextension enable --py rucio_jupyterlab --sys-prefix
81+
RUN ln -s $(pip show rucio-jupyterlab | grep -oP 'Location: \K.*')/rucio_jupyterlab ${SWAN_LIB_DIR}/extensions/
82+
#RUN jupyter serverextension enable --py rucio_jupyterlab --sys-prefix
8983

9084
# Grant scripts execution permissions
9185
RUN chmod +x /usr/local/bin/before-notebook.d/*

0 commit comments

Comments
 (0)