Include elyra package in all data science workbenches (opendatahub-io#58)

* Include elyra package in all data science workbenches

- Filter out Pipeline plugin only for local and kfp
- Pre-set the kfp-tekton for kfp pipeline support

Signed-off-by: Harshad Reddy Nalla <[email protected]>

* Point all images label at opendatahub/workbench-images repo

Signed-off-by: Harshad Reddy Nalla <[email protected]>

---------

Signed-off-by: Harshad Reddy Nalla <[email protected]>

Author: harshad16

Diff for: base/ubi8-python-3.8/Dockerfile

@@ -8,7 +8,7 @@ LABEL name="odh-notebook-base-ubi8-python-3.8" \
       authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
       io.openshift.build.commit.ref="main" \
       io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/base/ubi8-python-3.8" \
-      io.openshift.build.image="quay.io/opendatahub/notebooks:base-ubi8-python-3.8"
+      io.openshift.build.image="quay.io/opendatahub/workbench-images:base-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 

Diff for: base/ubi9-python-3.9/Dockerfile

@@ -8,7 +8,7 @@ LABEL name="odh-notebook-base-ubi9-python-3.9" \
       authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
       io.openshift.build.commit.ref="main" \
       io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/base/ubi9-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/notebooks:base-ubi9-python-3.9"
+      io.openshift.build.image="quay.io/opendatahub/workbench-images:base-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin
 

Diff for: cuda/ubi8-python-3.8/Dockerfile

@@ -9,7 +9,7 @@ LABEL name="odh-notebook-cuda-ubi8-python-3.8" \
       authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
       io.openshift.build.commit.ref="main" \
       io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/cuda/ubi8-python-3.8" \
-      io.openshift.build.image="quay.io/opendatahub/notebooks:cuda-ubi8-python-3.8"
+      io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-ubi8-python-3.8"
 
 # Install CUDA base from:
 # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.4.2/ubi8/base/Dockerfile

Diff for: cuda/ubi9-python-3.9/Dockerfile

@@ -9,7 +9,7 @@ LABEL name="odh-notebook-cuda-ubi9-python-3.9" \
       authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
       io.openshift.build.commit.ref="main" \
       io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/cuda/ubi9-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/notebooks:cuda-ubi9-python-3.9"
+      io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-ubi9-python-3.9"
 
 # Install CUDA base from:
 # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.8.0/ubi8/base/Dockerfile

Diff for: jupyter/datascience/ubi8-python-3.8/Dockerfile

@@ -9,19 +9,26 @@ LABEL name="odh-notebook-jupyter-datascience-ubi8-python-3.8" \
     authoritative-source-url="https://github.com/opendatahub-io/notebooks" \
     io.openshift.build.commit.ref="main" \
     io.openshift.build.source-location="https://github.com/opendatahub-io/notebooks/tree/main/jupyter/datascience/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/notebooks:jupyter-datascience-ubi8-python-3.8"
+    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-datascience-ubi8-python-3.8"
+
+WORKDIR /opt/app-root/bin
 
 # Install Python packages and Jupyterlab extensions from Pipfile.lock
 COPY Pipfile.lock ./
+# Copy Elyra setup to utils so that it's sourced at startup
+COPY jupyter_elyra_config.py setup-elyra.sh ./utils/
 
-RUN echo "Installing softwares and packages" && micropipenv install && rm -f ./Pipfile.lock
-
-# Explicitly enable jupyterlab_s3_browser plugin
-RUN jupyter serverextension enable --py jupyterlab_s3_browser
-
-# Remove Elyra logo from JupyterLab because this is not a pure Elyra image \
-RUN sed -i 's/widget\.id === \x27jp-MainLogo\x27/widget\.id === \x27jp-MainLogo\x27 \&\& false/' /opt/app-root/share/jupyter/labextensions/@elyra/theme-extension/static/lib_index_js.*.js
-
-# Fix permissions to support pip in Openshift environments
-RUN chmod -R g+w /opt/app-root/lib/python3.8/site-packages && \
+RUN echo "Installing softwares and packages" && \
+    micropipenv install && \
+    rm -f ./Pipfile.lock && \
+    # Explicitly enable jupyterlab_s3_browser plugin \
+    jupyter serverextension enable --py jupyterlab_s3_browser && \
+    # Remove Elyra logo from JupyterLab because this is not a pure Elyra image \
+    sed -i 's/widget\.id === \x27jp-MainLogo\x27/widget\.id === \x27jp-MainLogo\x27 \&\& false/' /opt/app-root/share/jupyter/labextensions/@elyra/theme-extension/static/lib_index_js.*.js && \
+    # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
+    sed -i -e "s/Python.*/$(python --version)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
+    # Fix permissions to support pip in Openshift environments \
+    chmod -R g+w /opt/app-root/lib/python3.8/site-packages && \
     fix-permissions /opt/app-root -P
+
+WORKDIR /opt/app-root/src

Diff for: jupyter/datascience/ubi8-python-3.8/Pipfile

@@ -7,9 +7,13 @@ name = "pypi"
 
 [packages]
 # Datascience and useful extensions
+elyra-pipeline-editor-extension = "~=3.15.0"
+elyra-python-editor-extension = "~=3.15.0"
+elyra-code-snippet-extension = "~=3.15.0"
+kfp-tekton = "<1.6.0"
+
 boto3 = "~=1.26.69"
 jupyter-bokeh = "~=3.0.5"
-elyra-python-editor-extension = "~=3.14.2"
 kafka-python = "~=2.0.2"
 matplotlib = "~=3.6.3"
 numpy = "~=1.24.1"