RHOAIENG-16518: ref(jupyter): deduplicate the Jupyterlab loading spinner code using the improvements put into place just before (opendatahub-io#801)

Author: jiridanek

jupyter/intel/ml/ubi9-python-3.11/Dockerfile

@@ -1,6 +1,7 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG REUSABLE_UTILS=jupyter/utils
 ARG SOURCE_CODE=jupyter/intel/ml/ubi9-python-3.11
 
 LABEL name="odh-notebook-jupyter-intel-ml-ubi9-python-3.11" \
@@ -32,7 +33,7 @@ RUN echo "Installing softwares and packages" && \
 #Replacing kernel manually with oneapi variable setting script
 COPY --chown=1001:0 ${SOURCE_CODE}/start-notebook.sh /opt/app-root/bin
 COPY --chown=1001:0 ${SOURCE_CODE}/builder /opt/app-root/builder
-COPY --chown=1001:0 ${SOURCE_CODE}/utils /opt/app-root/bin/utils
+COPY --chown=1001:0 ${REUSABLE_UTILS} /opt/app-root/bin/utils
 
 # Apply JupyterLab addons
 RUN /opt/app-root/bin/utils/addons/apply.sh

jupyter/intel/ml/ubi9-python-3.9/Dockerfile

@@ -1,6 +1,7 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG REUSABLE_UTILS=jupyter/utils
 ARG SOURCE_CODE=jupyter/intel/ml/ubi9-python-3.9
 
 LABEL name="odh-notebook-jupyter-intel-ml-ubi9-python-3.9" \
@@ -32,7 +33,7 @@ RUN echo "Installing softwares and packages" && \
 #Replacing kernel manually with oneapi variable setting script
 COPY --chown=1001:0 ${SOURCE_CODE}/start-notebook.sh /opt/app-root/bin
 COPY --chown=1001:0 ${SOURCE_CODE}/builder /opt/app-root/builder
-COPY --chown=1001:0 ${SOURCE_CODE}/utils /opt/app-root/bin/utils
+COPY --chown=1001:0 ${REUSABLE_UTILS} /opt/app-root/bin/utils
 
 # Apply JupyterLab addons
 RUN /opt/app-root/bin/utils/addons/apply.sh

jupyter/intel/pytorch/ubi9-python-3.11/Dockerfile

@@ -1,6 +1,7 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG REUSABLE_UTILS=jupyter/utils
 ARG SOURCE_CODE=jupyter/intel/pytorch/ubi9-python-3.11
 
 LABEL name="odh-notebook-jupyter-intel-pytorch-ubi9-python-3.11" \
@@ -47,7 +48,7 @@ COPY --chown=1001:0 ${SOURCE_CODE}/start-kernel /opt/app-root/bin/start-kernel
 COPY --chown=1001:0 ${SOURCE_CODE}/kernel-gpu.json /opt/app-root/share/jupyter/kernels/python3/kernel.json
 COPY --chown=1001:0 ${SOURCE_CODE}/start-notebook.sh /opt/app-root/bin
 COPY --chown=1001:0 ${SOURCE_CODE}/builder /opt/app-root/builder
-COPY --chown=1001:0 ${SOURCE_CODE}/utils /opt/app-root/bin/utils
+COPY --chown=1001:0 ${REUSABLE_UTILS} /opt/app-root/bin/utils
 
 #CPU env
 ENV CPU_ENV=/opt/app-root-cpu

jupyter/intel/pytorch/ubi9-python-3.11/utils/addons/apply.sh

@@ -1,6 +1,7 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG REUSABLE_UTILS=jupyter/utils
 ARG SOURCE_CODE=jupyter/intel/pytorch/ubi9-python-3.9
 
 LABEL name="odh-notebook-jupyter-intel-pytorch-ubi9-python-3.9" \
@@ -46,7 +47,7 @@ COPY --chown=1001:0 ${SOURCE_CODE}/start-kernel /opt/app-root/bin/start-kernel
 COPY --chown=1001:0 ${SOURCE_CODE}/kernel-gpu.json /opt/app-root/share/jupyter/kernels/python3/kernel.json
 COPY --chown=1001:0 ${SOURCE_CODE}/start-notebook.sh /opt/app-root/bin
 COPY --chown=1001:0 ${SOURCE_CODE}/builder /opt/app-root/builder
-COPY --chown=1001:0 ${SOURCE_CODE}/utils /opt/app-root/bin/utils
+COPY --chown=1001:0 ${REUSABLE_UTILS} /opt/app-root/bin/utils
 
 #CPU env
 ENV CPU_ENV=/opt/app-root-cpu

jupyter/intel/pytorch/ubi9-python-3.11/utils/addons/partial-body.html

@@ -1,6 +1,7 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG REUSABLE_UTILS=jupyter/utils
 ARG SOURCE_CODE=jupyter/intel/tensorflow/ubi9-python-3.11
 
 LABEL name="odh-notebook-jupyter-intel-tensorflow-ubi9-python-3.11" \
@@ -48,7 +49,7 @@ COPY --chown=1001:0 ${SOURCE_CODE}/start-kernel /opt/app-root/bin/start-kernel
 COPY --chown=1001:0 ${SOURCE_CODE}/kernel-gpu.json /opt/app-root/share/jupyter/kernels/python3/kernel.json
 COPY --chown=1001:0 ${SOURCE_CODE}/start-notebook.sh /opt/app-root/bin
 COPY --chown=1001:0 ${SOURCE_CODE}/builder /opt/app-root/builder
-COPY --chown=1001:0 ${SOURCE_CODE}/utils /opt/app-root/bin/utils
+COPY --chown=1001:0 ${REUSABLE_UTILS} /opt/app-root/bin/utils
 
 #CPU env
 ENV CPU_ENV=/opt/app-root-cpu