diff --git a/.github/workflows/env-build.yaml b/.github/workflows/env-build.yaml index 4fb04324..b74fb572 100644 --- a/.github/workflows/env-build.yaml +++ b/.github/workflows/env-build.yaml @@ -3,7 +3,7 @@ name: Docker automatic build and publish on: push: branches: - - main + - vre-swan-cern_build-from-wheels env: REGISTRY: ghcr.io diff --git a/vre-swan-cern/Dockerfile b/vre-swan-cern/Dockerfile index 3f53dc2c..17196ebe 100644 --- a/vre-swan-cern/Dockerfile +++ b/vre-swan-cern/Dockerfile @@ -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="swan-admins@cern.ch" @@ -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 @@ -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/* diff --git a/vre-swan-cern/rucio_jupyterlab-1.3.0-py3-none-any.whl b/vre-swan-cern/rucio_jupyterlab-1.3.0-py3-none-any.whl new file mode 100644 index 00000000..41ad3d4c Binary files /dev/null and b/vre-swan-cern/rucio_jupyterlab-1.3.0-py3-none-any.whl differ diff --git a/vre-swan-cern/rucio_jupyterlab-1.3.1-py3-none-any.whl b/vre-swan-cern/rucio_jupyterlab-1.3.1-py3-none-any.whl new file mode 100644 index 00000000..d20932bf Binary files /dev/null and b/vre-swan-cern/rucio_jupyterlab-1.3.1-py3-none-any.whl differ diff --git a/vre-swan-cern/rucio_jupyterlab-1.3.2-py3-none-any.whl b/vre-swan-cern/rucio_jupyterlab-1.3.2-py3-none-any.whl new file mode 100644 index 00000000..26774d62 Binary files /dev/null and b/vre-swan-cern/rucio_jupyterlab-1.3.2-py3-none-any.whl differ