Skip to content

Commit 0ee3972

Browse files
atheo89atheo89
committed
Remove Elyra bits till be compatible with JupyterLab 4.2
1 parent 39c0c9b commit 0ee3972

File tree

2 files changed

+33
-28
lines changed

2 files changed

+33
-28
lines changed

‎jupyter/datascience/ubi9-python-3.11/Dockerfile‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ WORKDIR /opt/app-root/bin
1515

1616
# Install Python packages and Jupyterlab extensions from Pipfile.lock
1717
COPY Pipfile.lock ./
18+
19+
# TO DO: Uncomment this lines when elyra compatibility with jupyterlab 4.2 is done
1820
# Copy Elyra setup to utils so that it's sourced at startup
19-
COPY setup-elyra.sh ./utils/
21+
# COPY setup-elyra.sh ./utils/
2022

2123
RUN echo "Installing softwares and packages" && \
2224
micropipenv install && \
@@ -51,33 +53,35 @@ ENV PATH="$PATH:/opt/mssql-tools18/bin"
5153
# Other apps and tools installed as default user
5254
USER 1001
5355

56+
# TO DO: Uncomment this lines when elyra compatibility with jupyterlab 4.2 is done
5457
# setup path for runtime configuration
55-
RUN mkdir /opt/app-root/runtimes && \
56-
# switch to Data Science Pipeline \
57-
cp utils/pipeline-flow.svg /opt/app-root/lib/python3.11/site-packages/elyra/static/icons/kubeflow.svg && \
58-
sed -i "s/Kubeflow Pipelines/Data Science/g" /opt/app-root/lib/python3.11/site-packages/elyra/pipeline/runtime_type.py && \
59-
sed -i "s/Kubeflow Pipelines/Data Science Pipelines/g" /opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/kfp.json && \
60-
sed -i "s/kubeflow-service/data-science-pipeline-service/g" /opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/kfp.json && \
61-
# switch to Data Science Pipeline in component catalog \
62-
DIR_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/local-directory-catalog.json" && \
63-
FILE_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/local-file-catalog.json" && \
64-
URL_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/url-catalog.json" && \
65-
tmp=$(mktemp) && \
66-
jq '.properties.metadata.properties.runtime_type = input' $DIR_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $DIR_COMPONENT && \
67-
jq '.properties.metadata.properties.runtime_type = input' $FILE_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $FILE_COMPONENT && \
68-
jq '.properties.metadata.properties.runtime_type = input' $URL_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $URL_COMPONENT && \
69-
sed -i "s/metadata.metadata.runtime_type/\"DATA_SCIENCE_PIPELINES\"/g" /opt/app-root/share/jupyter/labextensions/@elyra/pipeline-editor-extension/static/lib_index_js.*.js && \
70-
# Remove Elyra logo from JupyterLab because this is not a pure Elyra image \
71-
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 && \
72-
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
73-
sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
74-
# Remove default Elyra runtime-images \
75-
rm /opt/app-root/share/jupyter/metadata/runtime-images/*.json && \
76-
# Fix permissions to support pip in Openshift environments \
58+
# RUN mkdir /opt/app-root/runtimes && \
59+
# # switch to Data Science Pipeline \
60+
# cp utils/pipeline-flow.svg /opt/app-root/lib/python3.11/site-packages/elyra/static/icons/kubeflow.svg && \
61+
# sed -i "s/Kubeflow Pipelines/Data Science/g" /opt/app-root/lib/python3.11/site-packages/elyra/pipeline/runtime_type.py && \
62+
# sed -i "s/Kubeflow Pipelines/Data Science Pipelines/g" /opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/kfp.json && \
63+
# sed -i "s/kubeflow-service/data-science-pipeline-service/g" /opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/kfp.json && \
64+
# # switch to Data Science Pipeline in component catalog \
65+
# DIR_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/local-directory-catalog.json" && \
66+
# FILE_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/local-file-catalog.json" && \
67+
# URL_COMPONENT="/opt/app-root/lib/python3.11/site-packages/elyra/metadata/schemas/url-catalog.json" && \
68+
# tmp=$(mktemp) && \
69+
# jq '.properties.metadata.properties.runtime_type = input' $DIR_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $DIR_COMPONENT && \
70+
# jq '.properties.metadata.properties.runtime_type = input' $FILE_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $FILE_COMPONENT && \
71+
# jq '.properties.metadata.properties.runtime_type = input' $URL_COMPONENT utils/component_runtime.json > "$tmp" && mv "$tmp" $URL_COMPONENT && \
72+
# sed -i "s/metadata.metadata.runtime_type/\"DATA_SCIENCE_PIPELINES\"/g" /opt/app-root/share/jupyter/labextensions/@elyra/pipeline-editor-extension/static/lib_index_js.*.js && \
73+
# # Remove Elyra logo from JupyterLab because this is not a pure Elyra image \
74+
# 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 && \
75+
# # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
76+
RUN sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
77+
# TO DO: Uncomment this lines when elyra compatibility with jupyterlab 4.2 is done
78+
# # Remove default Elyra runtime-images \
79+
# rm /opt/app-root/share/jupyter/metadata/runtime-images/*.json && \
80+
# # Fix permissions to support pip in Openshift environments \
7781
chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
7882
fix-permissions /opt/app-root -P
7983

80-
# Copy Elyra runtime-images definitions and set the version
81-
COPY runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
84+
# # Copy Elyra runtime-images definitions and set the version
85+
# COPY runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
8286

8387
WORKDIR /opt/app-root/src

‎jupyter/tensorflow/ubi9-python-3.11/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ COPY Pipfile.lock ./
1717

1818
RUN echo "Installing softwares and packages" && micropipenv install && rm -f ./Pipfile.lock
1919

20+
# TO DO: Uncomment this lines when elyra compatibility with jupyterlab 4.2 is done
2021
# Temporary:Workaround for fixing the kfp-kubernetes 1.0.0 for elyra pipeline execution
2122
# TODO: Remove this patch once the issue is fixed with kfp-kubernetes upgrade.
22-
RUN patch /opt/app-root/lib/python3.11/site-packages/elyra/templates/kubeflow/v2/python_dsl_template.jinja2 -i utils/python_dsl_template.patch && \
23-
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
24-
sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
23+
# RUN patch /opt/app-root/lib/python3.11/site-packages/elyra/templates/kubeflow/v2/python_dsl_template.jinja2 -i utils/python_dsl_template.patch && \
24+
# # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
25+
RUN sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
2526
# Disable announcement plugin of jupyterlab \
2627
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
2728
# Fix permissions to support pip in Openshift environments \

0 commit comments

Comments
 (0)