Merge pull request #909 from atheo89/rhoaieng-20241

Include script on workbench to copy runtime-image json to relevant path

Author: openshift-merge-bot[bot]

jupyter/datascience/ubi9-python-3.11/Dockerfile.cpu

@@ -91,6 +91,7 @@ RUN echo "Installing softwares and packages" && \
     rm -f ./Pipfile.lock && \
     # setup path for runtime configuration
     mkdir /opt/app-root/runtimes && \
+    mkdir /opt/app-root/pipeline-runtimes && \
     # Remove default Elyra runtime-images \
     rm /opt/app-root/share/jupyter/metadata/runtime-images/*.json && \
     # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
@@ -103,7 +104,4 @@ RUN echo "Installing softwares and packages" && \
     chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
     fix-permissions /opt/app-root -P
 
-# Copy Elyra runtime-images definitions and set the version
-COPY ${DATASCIENCE_SOURCE_CODE}/runtime-images/ /opt/app-root/share/jupyter/metadata/runtime-images/
-
 WORKDIR /opt/app-root/src

jupyter/datascience/ubi9-python-3.11/setup-elyra.sh

@@ -14,6 +14,11 @@ if [ "$(ls -A /opt/app-root/runtimes/)" ]; then
   cp -r /opt/app-root/runtimes/..data/*.json $(jupyter --data-dir)/metadata/runtimes/
 fi
 
+# Set elyra runtime images json from volume mount
+if [ "$(ls -A /opt/app-root/pipeline-runtimes/)" ]; then
+  cp -r /opt/app-root/pipeline-runtimes/..data/*.json /opt/app-root/share/jupyter/metadata/runtime-images/
+fi
+
 # Environment vars set for accessing ssl_sa_certs and sa_token
 # export PIPELINES_SSL_SA_CERTS="/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
 export KF_PIPELINES_SA_TOKEN_ENV="/var/run/secrets/kubernetes.io/serviceaccount/token"