[Fix/enhancement] dockerimage labels check and attempted to deduplicate

This change tries to deduplicate some strings in our docker image labels with ability to propagate some common values directly from the Makefile so we don't need to change these values with every release branch or for every newly introduced docker image. There were some minor fixes in the labels introduced too in this commit. --- Relates to: #292
opendatahub-io · Dec 7, 2023 · 650db9b · 650db9b
1 parent 9e1ed7a
commit 650db9b
Show file tree

Hide file tree

Showing 30 changed files with 237 additions and 119 deletions.
diff --git a/Makefile b/Makefile
@@ -5,6 +5,7 @@ DATE 			 ?= $(shell date +'%Y%m%d')
 IMAGE_TAG		 ?= $(RELEASE)_$(DATE)
 KUBECTL_BIN      ?= bin/kubectl
 KUBECTL_VERSION  ?= v1.23.11
+AUTHORITATIVE_SOURCE_URL ?= https://github.com/opendatahub-io/notebooks
 NOTEBOOK_REPO_BRANCH_BASE ?= https://raw.githubusercontent.com/opendatahub-io/notebooks/main
 REQUIRED_RUNTIME_IMAGE_COMMANDS="curl python3"
 REQUIRED_CODE_SERVER_IMAGE_COMMANDS="curl python oc code-server"
@@ -18,12 +19,13 @@ REQUIRED_R_STUDIO_IMAGE_COMMANDS="curl python oc /usr/lib/rstudio-server/bin/rse
 define build_image
 	$(eval IMAGE_NAME := $(IMAGE_REGISTRY):$(1)-$(IMAGE_TAG))
 	$(info # Building $(IMAGE_NAME) image...)
+	$(eval BUILD_ARGS := --build-arg BUILD_COMMIT_REF=$(RELEASE) --build-arg IMAGE_REGISTRY=$(IMAGE_REGISTRY) \
+		--build-arg AUTHORITATIVE_SOURCE_URL=$(AUTHORITATIVE_SOURCE_URL))
 	$(if $(3),
 		$(eval BASE_IMAGE_NAME := $(IMAGE_REGISTRY):$(3)-$(IMAGE_TAG))
-		$(eval BUILD_ARGS := --build-arg BASE_IMAGE=$(BASE_IMAGE_NAME)),
-		$(eval BUILD_ARGS :=)
+		$(eval BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(BASE_IMAGE_NAME)),
 	)
-	$(CONTAINER_ENGINE) build --no-cache  -t $(IMAGE_NAME) $(BUILD_ARGS) $(2)
+	$(CONTAINER_ENGINE) build --no-cache --tag $(IMAGE_NAME) $(BUILD_ARGS) $(2)
 endef
 
 # Push function for the notebok image:

diff --git a/base/c9s-python-3.9/Dockerfile b/base/c9s-python-3.9/Dockerfile
@@ -1,14 +1,18 @@
 FROM quay.io/sclorg/python-39-c9s:c9s
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="odh-notebook-base-centos-stream9-python-3.9" \
       summary="Python 3.9 CentOS Stream 9 base image for ODH notebooks" \
       description="Base Python 3.9 builder image based on CentOS Stream 9 for ODH notebooks" \
       io.k8s.display-name="Python 3.9 c9s base image for ODH notebooks" \
       io.k8s.description="Base Python 3.9 builder image based on C9S for ODH notebooks" \
-      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/c9s-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:base-c9s-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/base/c9s-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:base-c9s-python-3.9"
 
 WORKDIR /opt/app-root/bin
 

diff --git a/base/ubi8-python-3.8/Dockerfile b/base/ubi8-python-3.8/Dockerfile
@@ -1,14 +1,18 @@
 FROM registry.access.redhat.com/ubi8/python-38:latest
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="odh-notebook-base-ubi8-python-3.8" \
       summary="Python 3.8 base image for ODH notebooks" \
       description="Base Python 3.8 builder image based on UBI8 for ODH notebooks" \
       io.k8s.display-name="Python 3.8 base image for ODH notebooks" \
       io.k8s.description="Base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-      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/workbench-images:base-ubi8-python-3.8"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/base/ubi8-python-3.8" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:base-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 

diff --git a/base/ubi9-python-3.9/Dockerfile b/base/ubi9-python-3.9/Dockerfile
@@ -1,14 +1,18 @@
 FROM registry.access.redhat.com/ubi9/python-39:latest
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="odh-notebook-base-ubi9-python-3.9" \
       summary="Python 3.9 base image for ODH notebooks" \
       description="Base Python 3.9 builder image based on UBI9 for ODH notebooks" \
       io.k8s.display-name="Python 3.9 base image for ODH notebooks" \
       io.k8s.description="Base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-      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/workbench-images:base-ubi9-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/base/ubi9-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:base-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin
 

diff --git a/codeserver/c9s-python-3.9/Dockerfile b/codeserver/c9s-python-3.9/Dockerfile
@@ -1,17 +1,21 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 ARG CODESERVER_VERSION=v4.16.1
 
 LABEL name="odh-notebook-code-server-c9s-python-3.9" \
       summary="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
       description="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
       io.k8s.display-name="Code Server (VS Code) image with python 3.9 based on CentOS Stream 9" \
       io.k8s.description="Code Server (VS Code) image with python 3.9 based on CentOS Stream 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/codeserver/c9s-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:codeserver-c9s-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/codeserver/c9s-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:codeserver-c9s-python-3.9"
 
 USER 0
 

diff --git a/codeserver/ubi9-python-3.9/Dockerfile b/codeserver/ubi9-python-3.9/Dockerfile
@@ -1,17 +1,21 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 ARG CODESERVER_VERSION=v4.16.1
 
 LABEL name="odh-notebook-code-server-ubi9-python-3.9" \
       summary="Code Server (VS Code) image with python 3.9 based on UBI 9" \
       description="Code Server (VS Code) image with python 3.9 based on UBI9" \
       io.k8s.display-name="Code Server (VS Code) image with python 3.9 based on UBI9" \
       io.k8s.description="Code Server (VS Code) image with python 3.9 based on UBI9" \
-      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/codeserver/ubi9-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:codeserver-ubi9-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/codeserver/ubi9-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:codeserver-ubi9-python-3.9"
 
 USER 0
 

diff --git a/cuda/c9s-python-3.9/Dockerfile b/cuda/c9s-python-3.9/Dockerfile
@@ -1,15 +1,19 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="odh-notebook-cuda-c9s-python-3.9" \
       summary="CUDA Python 3.9 base image for ODH notebooks" \
       description="CUDA Python 3.9 builder image based on CentOS Stream 9 for ODH notebooks" \
       io.k8s.display-name="CUDA Python 3.9 base image for ODH notebooks" \
       io.k8s.description="CUDA Python 3.9 builder image based on C9S for ODH notebooks" \
-      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/c9s-python-3.9" \
-      io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-c9s-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/cuda/c9s-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}:cuda-c9s-python-3.9"
 
 # Install CUDA base from:
 # https://gitlab.com/nvidia/container-images/cuda/-/blob/master/dist/11.8.0/ubi8/base/Dockerfile

diff --git a/cuda/ubi8-python-3.8/Dockerfile b/cuda/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,19 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="odh-notebook-cuda-ubi8-python-3.8" \
       summary="CUDA Python 3.8 base image for ODH notebooks" \
       description="CUDA Python 3.8 builder image based on UBI8 for ODH notebooks" \
       io.k8s.display-name="CUDA Python 3.8 base image for ODH notebooks" \
       io.k8s.description="CUDA Python 3.8 builder image based on UBI8 for ODH notebooks" \
-      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/workbench-images:cuda-ubi8-python-3.8"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/cuda/ubi8-python-3.8" \
+      io.openshift.build.image="${IMAGE_REGISTRY}: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 --git a/cuda/ubi9-python-3.9/Dockerfile b/cuda/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,19 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="odh-notebook-cuda-ubi9-python-3.9" \
       summary="CUDA Python 3.9 base image for ODH notebooks" \
       description="CUDA Python 3.9 builder image based on UBI8 for ODH notebooks" \
       io.k8s.display-name="CUDA Python 3.9 base image for ODH notebooks" \
       io.k8s.description="CUDA Python 3.9 builder image based on UBI8 for ODH notebooks" \
-      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/workbench-images:cuda-ubi9-python-3.9"
+      authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+      io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+      io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/cuda/ubi9-python-3.9" \
+      io.openshift.build.image="${IMAGE_REGISTRY}: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 --git a/habana/1.10.0/ubi8-python-3.8/Dockerfile b/habana/1.10.0/ubi8-python-3.8/Dockerfile
@@ -7,6 +7,10 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 ARG ARTIFACTORY_URL="vault.habana.ai"
 ARG VERSION="1.10.0"
 ARG REVISION="494"
@@ -147,10 +151,10 @@ LABEL name="odh-notebook-habana-jupyter-1.10.0-ubi8-python-3.8" \
     description="Jupyter HabanaAI 1.10.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
     io.k8s.display-name="Jupyter HabanaAI 1.10.0 notebook image for ODH notebooks" \
     io.k8s.description="Jupyter HabanaAI 1.10.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
-    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/habana/1.10.0/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:habana-jupyter-1.10.0-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/habana/1.10.0/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:habana-jupyter-1.10.0-ubi8-python-3.8"
 
 # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x
 RUN sed -i -e "s/Python.*/$(python --version| cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \

diff --git a/habana/1.11.0/ubi8-python-3.8/Dockerfile b/habana/1.11.0/ubi8-python-3.8/Dockerfile
@@ -7,6 +7,10 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 ARG ARTIFACTORY_URL="vault.habana.ai"
 ARG VERSION="1.11.0"
 ARG REVISION="587"
@@ -151,10 +155,10 @@ LABEL name="odh-notebook-habana-jupyter-1.11.0-ubi8-python-3.8" \
     description="Jupyter HabanaAI 1.11.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
     io.k8s.display-name="Jupyter HabanaAI 1.11.0 notebook image for ODH notebooks" \
     io.k8s.description="Jupyter HabanaAI 1.11.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
-    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/habana/1.11.0/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:habana-jupyter-1.11.0-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/habana/1.11.0/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:habana-jupyter-1.11.0-ubi8-python-3.8"
 
 # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x
 RUN sed -i -e "s/Python.*/$(python --version| cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \

diff --git a/habana/1.9.0/ubi8-python-3.8/Dockerfile b/habana/1.9.0/ubi8-python-3.8/Dockerfile
@@ -7,6 +7,10 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 ARG ARTIFACTORY_URL="vault.habana.ai"
 ARG VERSION="1.9.0"
 ARG REVISION="580"
@@ -136,10 +140,10 @@ LABEL name="odh-notebook-habana-jupyter-1.9.0-ubi8-python-3.8" \
     description="Jupyter HabanaAI 1.9.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
     io.k8s.display-name="Jupyter HabanaAI 1.9.0 notebook image for ODH notebooks" \
     io.k8s.description="Jupyter HabanaAI 1.9.0 notebook image with base Python 3.8 builder image based on ubi8 for ODH notebooks" \
-    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/habana/1.9.0/ubi8-python-3.8" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:habana-jupyter-1.9.0-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/habana/1.9.0/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:habana-jupyter-1.9.0-ubi8-python-3.8"
 
 # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x
 RUN sed -i -e "s/Python.*/$(python --version| cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \

diff --git a/jupyter/datascience/anaconda-python-3.8/Dockerfile b/jupyter/datascience/anaconda-python-3.8/Dockerfile
@@ -1,17 +1,21 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="jupyter-datascience-anaconda-python-3.8:latest" \
     summary="Minimal Jupyter Notebook Source-to-Image for Python 3.8 applications. Uses Anaconda CE instead of pip." \
     description="Notebook image based on Anaconda CE Python.These images can be used in OpenDatahub JupterHub." \
     io.k8s.description="Notebook image based on Anaconda CE Python.These images can be used in OpenDatahub JupterHub." \
     io.k8s.display-name="Anaconda s2i-minimal-notebook, python38" \
     io.openshift.expose-services="8888:http" \
     io.openshift.tags="python,python38,python-38,anaconda-python38" \
-    authoritative-source-url="https://quay.io//opendatahub/workbench-images:jupyter-datascience-anaconda-python-3.8" \
-    io.openshift.s2i.build.commit.ref="main" \
-    io.openshift.s2i.build.source-location="https://github.com/opendatahub-io/notebooks/jupyter/datascience/anaconda-python-3.8" \
-    io.openshift.s2i.build.image="quay.io/repository/opendatahub/workbench-images:jupyter-datascience-anaconda-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.s2i.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.s2i.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/jupyter/datascience/anaconda-python-3.8" \
+    io.openshift.s2i.build.image="${IMAGE_REGISTRY}:jupyter-datascience-anaconda-python-3.8"
 
 ENV JUPYTER_ENABLE_LAB="1"
 USER root

diff --git a/jupyter/datascience/ubi8-python-3.8/Dockerfile b/jupyter/datascience/ubi8-python-3.8/Dockerfile
@@ -1,15 +1,19 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="odh-notebook-jupyter-datascience-ubi8-python-3.8" \
     summary="Jupyter data science notebook image for ODH notebooks" \
     description="Jupyter data science notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
     io.k8s.display-name="Jupyter data science notebook image for ODH notebooks" \
     io.k8s.description="Jupyter data science notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \
-    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/workbench-images:jupyter-datascience-ubi8-python-3.8"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/jupyter/datascience/ubi8-python-3.8" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-datascience-ubi8-python-3.8"
 
 WORKDIR /opt/app-root/bin
 

diff --git a/jupyter/datascience/ubi9-python-3.9/Dockerfile b/jupyter/datascience/ubi9-python-3.9/Dockerfile
@@ -1,15 +1,19 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
+ARG AUTHORITATIVE_SOURCE_URL
+ARG BUILD_COMMIT_REF
+ARG IMAGE_REGISTRY
+
 LABEL name="odh-notebook-jupyter-datascience-ubi9-python-3.9" \
     summary="Jupyter data science notebook image for ODH notebooks" \
     description="Jupyter data science notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
     io.k8s.display-name="Jupyter data science notebook image for ODH notebooks" \
     io.k8s.description="Jupyter data science notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \
-    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/ubi9-python-3.9" \
-    io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-datascience-ubi9-python-3.9"
+    authoritative-source-url="${AUTHORITATIVE_SOURCE_URL}" \
+    io.openshift.build.commit.ref="${BUILD_COMMIT_REF}" \
+    io.openshift.build.source-location="${AUTHORITATIVE_SOURCE_URL}/tree/${BUILD_COMMIT_REF}/jupyter/datascience/ubi9-python-3.9" \
+    io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-datascience-ubi9-python-3.9"
 
 WORKDIR /opt/app-root/bin