Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/env-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docker automatic build and publish
on:
push:
branches:
- main
- vre-swan-cern_build-from-wheels

env:
REGISTRY: ghcr.io
Expand Down
31 changes: 20 additions & 11 deletions vre-swan-cern/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#FROM gitlab-registry.cern.ch/swan/docker-images/jupyter/swan:${VERSION_PARENT}
# Same image as swan-cern/v0.0.48 - VRE-ied

ARG VERSION_PARENT=sha-8b00ce5
ARG VERSION_PARENT=sha-783ebac
FROM ghcr.io/vre-hub/vre-swan:${VERSION_PARENT}

LABEL maintainer="[email protected]"
Expand All @@ -29,13 +29,23 @@ RUN pip install --no-deps --no-cache-dir \
swandask==0.0.5

# CERN-VRE
#RUN pip install rucio-jupyterlab==1.2.0 --no-cache-dir
RUN git clone https://github.com/Soap2G/jupyterlab-extension.git \
&& cd jupyterlab-extension \
&& git checkout gguerrie-API-refactoring \
&& pip install . \
&& cd .. \
&& rm -rf jupyterlab-extension
RUN pip install --no-cache-dir --no-deps rucio-jupyterlab==1.2.1
#RUN jupyter server extension enable --py rucio_jupyterlab --sys-prefix

# Install Rucio jupytelab extension v1.3.0 from wheels

# v1.3.0
# COPY rucio_jupyterlab-1.3.0-py3-none-any.whl .
# RUN pip install rucio_jupyterlab-1.3.0-py3-none-any.whl

# v1.3.1
# COPY rucio_jupyterlab-1.3.1-py3-none-any.whl .
# RUN pip install rucio_jupyterlab-1.3.1-py3-none-any.whl

#v1.3.2
#COPY rucio_jupyterlab-1.3.2-py3-none-any.whl .
#RUN pip install rucio_jupyterlab-1.3.2-py3-none-any.whl


# Install swandaskcluster in the lib directory that is exposed to notebooks and
# terminals, which need it to do automatic TLS configuration for Dask clients
Expand Down Expand Up @@ -83,9 +93,8 @@ RUN ln -s $(pip show sparkconnector | grep -oP 'Location: \K.*')/sparkconnector
ln -s $(pip show simpervisor | grep -oP 'Location: \K.*')/simpervisor ${SWAN_LIB_DIR}/extensions/

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

# Grant scripts execution permissions
RUN chmod +x /usr/local/bin/before-notebook.d/*
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.