From 1326d630ba465a2583f84bfecd068ce24f4bbec4 Mon Sep 17 00:00:00 2001 From: Jan Stourac Date: Fri, 3 Nov 2023 23:50:18 +0100 Subject: [PATCH] [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: https://github.com/opendatahub-io/notebooks/issues/292 --- Makefile | 8 +++++--- base/c9s-python-3.9/Dockerfile | 12 ++++++++---- base/ubi8-python-3.8/Dockerfile | 12 ++++++++---- base/ubi9-python-3.9/Dockerfile | 12 ++++++++---- codeserver/c9s-python-3.9/Dockerfile | 12 ++++++++---- codeserver/ubi9-python-3.9/Dockerfile | 12 ++++++++---- cuda/c9s-python-3.9/Dockerfile | 12 ++++++++---- cuda/ubi8-python-3.8/Dockerfile | 12 ++++++++---- cuda/ubi9-python-3.9/Dockerfile | 12 ++++++++---- habana/1.10.0/ubi8-python-3.8/Dockerfile | 12 ++++++++---- habana/1.11.0/ubi8-python-3.8/Dockerfile | 12 ++++++++---- habana/1.9.0/ubi8-python-3.8/Dockerfile | 12 ++++++++---- jupyter/datascience/anaconda-python-3.8/Dockerfile | 12 ++++++++---- jupyter/datascience/ubi8-python-3.8/Dockerfile | 12 ++++++++---- jupyter/datascience/ubi9-python-3.9/Dockerfile | 12 ++++++++---- jupyter/minimal/ubi8-python-3.8/Dockerfile | 12 ++++++++---- jupyter/minimal/ubi9-python-3.9/Dockerfile | 12 ++++++++---- jupyter/pytorch/ubi9-python-3.9/Dockerfile | 12 ++++++++---- jupyter/tensorflow/ubi9-python-3.9/Dockerfile | 12 ++++++++---- jupyter/trustyai/ubi8-python-3.8/Dockerfile | 12 ++++++++---- jupyter/trustyai/ubi9-python-3.9/Dockerfile | 12 ++++++++---- rstudio/c9s-python-3.9/Dockerfile | 12 ++++++++---- runtimes/datascience/ubi8-python-3.8/Dockerfile | 12 ++++++++---- runtimes/datascience/ubi9-python-3.9/Dockerfile | 12 ++++++++---- runtimes/minimal/ubi8-python-3.8/Dockerfile | 12 ++++++++---- runtimes/minimal/ubi9-python-3.9/Dockerfile | 12 ++++++++---- runtimes/pytorch/ubi8-python-3.8/Dockerfile | 12 ++++++++---- runtimes/pytorch/ubi9-python-3.9/Dockerfile | 12 ++++++++---- runtimes/tensorflow/ubi8-python-3.8/Dockerfile | 12 ++++++++---- runtimes/tensorflow/ubi9-python-3.9/Dockerfile | 12 ++++++++---- 30 files changed, 237 insertions(+), 119 deletions(-) diff --git a/Makefile b/Makefile index 30f5e31dc..561168752 100644 --- 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 index d66745e4c..1c20f3962 100644 --- 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 index 8bcf148c7..c27cceae1 100644 --- 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 index 504b0c98f..124e94283 100644 --- 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 index 8f26ccc2d..704798f9a 100644 --- a/codeserver/c9s-python-3.9/Dockerfile +++ b/codeserver/c9s-python-3.9/Dockerfile @@ -1,6 +1,10 @@ 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" \ @@ -8,10 +12,10 @@ LABEL name="odh-notebook-code-server-c9s-python-3.9" \ description="code-server image with python 3.9 based on CentOS Stream 9" \ io.k8s.display-name="code-server image with python 3.9 based on CentOS Stream 9" \ io.k8s.description="code-server 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 index 44ec4171e..933a848a1 100644 --- a/codeserver/ubi9-python-3.9/Dockerfile +++ b/codeserver/ubi9-python-3.9/Dockerfile @@ -1,6 +1,10 @@ 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" \ @@ -8,10 +12,10 @@ LABEL name="odh-notebook-code-server-ubi9-python-3.9" \ description="code-server image with python 3.9 based on UBI9" \ io.k8s.display-name="code-server image with python 3.9 based on UBI9" \ io.k8s.description="code-server 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 index 7139d8b23..db306f83a 100644 --- 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 index 9cd82c8b7..b4bd56001 100644 --- 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 index b7c560e79..98e3cd733 100644 --- 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 index 411573ddf..147a508ed 100644 --- 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 index 45873d215..eaa87f27b 100644 --- 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 index 90bb1b31f..33ed94f59 100644 --- 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 index f62807860..6b9a24a70 100644 --- a/jupyter/datascience/anaconda-python-3.8/Dockerfile +++ b/jupyter/datascience/anaconda-python-3.8/Dockerfile @@ -1,6 +1,10 @@ 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." \ @@ -8,10 +12,10 @@ LABEL name="jupyter-datascience-anaconda-python-3.8:latest" \ 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 index a12c79afb..f57dacc57 100644 --- 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 index 861376b1d..dfd7e2cee 100644 --- 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 diff --git a/jupyter/minimal/ubi8-python-3.8/Dockerfile b/jupyter/minimal/ubi8-python-3.8/Dockerfile index 7b3d8f2e6..836fd3f53 100644 --- a/jupyter/minimal/ubi8-python-3.8/Dockerfile +++ b/jupyter/minimal/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-minimal-ubi8-python-3.8" \ summary="Minimal Jupyter notebook image for ODH notebooks" \ description="Minimal Jupyter notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \ io.k8s.display-name="Minimal Jupyter notebook image for ODH notebooks" \ io.k8s.description="Minimal Jupyter 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/minimal/ubi8-python-3.8" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-minimal-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/minimal/ubi8-python-3.8" \ + io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-minimal-ubi8-python-3.8" WORKDIR /opt/app-root/bin diff --git a/jupyter/minimal/ubi9-python-3.9/Dockerfile b/jupyter/minimal/ubi9-python-3.9/Dockerfile index 37befa970..3bbc750fb 100644 --- a/jupyter/minimal/ubi9-python-3.9/Dockerfile +++ b/jupyter/minimal/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-minimal-ubi9-python-3.9" \ summary="Minimal Jupyter notebook image for ODH notebooks" \ description="Minimal Jupyter notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \ io.k8s.display-name="Minimal Jupyter notebook image for ODH notebooks" \ io.k8s.description="Minimal Jupyter 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/minimal/ubi9-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-minimal-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/minimal/ubi9-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-minimal-ubi9-python-3.9" WORKDIR /opt/app-root/bin diff --git a/jupyter/pytorch/ubi9-python-3.9/Dockerfile b/jupyter/pytorch/ubi9-python-3.9/Dockerfile index dc5557385..187ad5d28 100644 --- a/jupyter/pytorch/ubi9-python-3.9/Dockerfile +++ b/jupyter/pytorch/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-pytorch-ubi9-python-3.9" \ summary="Jupyter pytorch notebook image for ODH notebooks" \ description="Jupyter pytorch notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \ io.k8s.display-name="Jupyter pytorch notebook image for ODH notebooks" \ io.k8s.description="Jupyter pytorch 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/pytorch/ubi9-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-pytorch-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/pytorch/ubi9-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-pytorch-ubi9-python-3.9" # Install Python packages and Jupyterlab extensions from Pipfile.lock COPY Pipfile.lock ./ diff --git a/jupyter/tensorflow/ubi9-python-3.9/Dockerfile b/jupyter/tensorflow/ubi9-python-3.9/Dockerfile index 76d8cdffa..2e079af2a 100644 --- a/jupyter/tensorflow/ubi9-python-3.9/Dockerfile +++ b/jupyter/tensorflow/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-jupyter-tensorflow-ubi9-python-3.9" \ summary="Jupyter CUDA tensorflow notebook image for ODH notebooks" \ description="Jupyter CUDA tensorflow notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \ io.k8s.display-name="Jupyter CUDA tensorflow notebook image for ODH notebooks" \ io.k8s.description="Jupyter CUDA tensorflow 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/tensorflow/ubi9-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-jupyter-tensorflow-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/tensorflow/ubi9-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:cuda-jupyter-tensorflow-ubi9-python-3.9" # Install Python packages and Jupyterlab extensions from Pipfile.lock COPY Pipfile.lock ./ diff --git a/jupyter/trustyai/ubi8-python-3.8/Dockerfile b/jupyter/trustyai/ubi8-python-3.8/Dockerfile index d69564170..002737126 100644 --- a/jupyter/trustyai/ubi8-python-3.8/Dockerfile +++ b/jupyter/trustyai/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-trustyai-ubi8-python-3.8" \ summary="Jupyter trustyai notebook image for ODH notebooks" \ description="Jupyter trustyai notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \ io.k8s.display-name="Jupyter trustyai notebook image for ODH notebooks" \ io.k8s.description="Jupyter trustyai 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/trustyai/ubi8-python-3.8" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-trustyai-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/trustyai/ubi8-python-3.8" \ + io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-trustyai-ubi8-python-3.8" USER 0 diff --git a/jupyter/trustyai/ubi9-python-3.9/Dockerfile b/jupyter/trustyai/ubi9-python-3.9/Dockerfile index 3dc7e3512..73635dda9 100644 --- a/jupyter/trustyai/ubi9-python-3.9/Dockerfile +++ b/jupyter/trustyai/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-trustyai-ubi9-python-3.9" \ summary="Jupyter trustyai notebook image for ODH notebooks" \ description="Jupyter trustyai notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \ io.k8s.display-name="Jupyter trustyai notebook image for ODH notebooks" \ io.k8s.description="Jupyter trustyai 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/trustyai/ubi9-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:jupyter-trustyai-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/trustyai/ubi9-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:jupyter-trustyai-ubi9-python-3.9" USER 0 diff --git a/rstudio/c9s-python-3.9/Dockerfile b/rstudio/c9s-python-3.9/Dockerfile index 97112bdc7..4c933466d 100644 --- a/rstudio/c9s-python-3.9/Dockerfile +++ b/rstudio/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-rstudio-server-c9s-python-3.9" \ summary="RStudio Server image with python 3.9 based on CentOS Stream 9" \ description="RStudio server image with python 3.9 based on CentOS Stream 9" \ io.k8s.display-name="RStudio server image with python 3.9 based on CentOS Stream 9" \ io.k8s.description="RStudio server 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/rstudio/c9s-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:rstudio-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}/rstudio/c9s-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:rstudio-c9s-python-3.9" USER 0 diff --git a/runtimes/datascience/ubi8-python-3.8/Dockerfile b/runtimes/datascience/ubi8-python-3.8/Dockerfile index d3e60cadb..c64b1b561 100644 --- a/runtimes/datascience/ubi8-python-3.8/Dockerfile +++ b/runtimes/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-runtime-datascience-ubi8-python-3.8" \ summary="Runtime data science notebook image for ODH notebooks" \ description="Runtime data science notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \ io.k8s.display-name="Runtime data science notebook image for ODH notebooks" \ io.k8s.description="Runtime 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/runtimes/datascience/ubi8-python-3.8" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-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}/runtimes/datascience/ubi8-python-3.8" \ + io.openshift.build.image="${IMAGE_REGISTRY}:runtime-datascience-ubi8-python-3.8" WORKDIR /opt/app-root/bin diff --git a/runtimes/datascience/ubi9-python-3.9/Dockerfile b/runtimes/datascience/ubi9-python-3.9/Dockerfile index bda475d9a..578e27fdb 100644 --- a/runtimes/datascience/ubi9-python-3.9/Dockerfile +++ b/runtimes/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-runtime-datascience-ubi9-python-3.9" \ summary="Runtime data science notebook image for ODH notebooks" \ description="Runtime data science notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \ io.k8s.display-name="Runtime data science notebook image for ODH notebooks" \ io.k8s.description="Runtime 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/runtimes/datascience/ubi9-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-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}/runtimes/datascience/ubi9-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:runtime-datascience-ubi9-python-3.9" WORKDIR /opt/app-root/bin diff --git a/runtimes/minimal/ubi8-python-3.8/Dockerfile b/runtimes/minimal/ubi8-python-3.8/Dockerfile index 57d949a3b..195c81b1d 100644 --- a/runtimes/minimal/ubi8-python-3.8/Dockerfile +++ b/runtimes/minimal/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-runtime-minimal-ubi8-python-3.8" \ summary="Runtime minimal image for ODH notebooks" \ description="Runtime minimal image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \ io.k8s.display-name="Runtime minimal image for ODH notebooks" \ io.k8s.description="Runtime minimal 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/runtimes/minimal/ubi8-python-3.8" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-minimal-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}/runtimes/minimal/ubi8-python-3.8" \ + io.openshift.build.image="${IMAGE_REGISTRY}:runtime-minimal-ubi8-python-3.8" WORKDIR /opt/app-root/bin diff --git a/runtimes/minimal/ubi9-python-3.9/Dockerfile b/runtimes/minimal/ubi9-python-3.9/Dockerfile index 684364dff..d98ae8a52 100644 --- a/runtimes/minimal/ubi9-python-3.9/Dockerfile +++ b/runtimes/minimal/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-runtime-minimal-ubi9-python-3.9" \ summary="Runtime minimal image for ODH notebooks" \ description="Runtime minimal image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \ io.k8s.display-name="Runtime minimal image for ODH notebooks" \ io.k8s.description="Runtime minimal 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/runtimes/minimal/ubi9-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-minimal-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}/runtimes/minimal/ubi9-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:runtime-minimal-ubi9-python-3.9" WORKDIR /opt/app-root/bin diff --git a/runtimes/pytorch/ubi8-python-3.8/Dockerfile b/runtimes/pytorch/ubi8-python-3.8/Dockerfile index e62fb55a0..4c694263e 100644 --- a/runtimes/pytorch/ubi8-python-3.8/Dockerfile +++ b/runtimes/pytorch/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-runtime-pytorch-ubi8-python-3.8" \ summary="Runtime pytorch notebook image for ODH notebooks" \ description="Runtime pytorch notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \ io.k8s.display-name="Runtime pytorch notebook image for ODH notebooks" \ io.k8s.description="Runtime pytorch 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/runtimes/pytorch/ubi8-python-3.8" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-pytorch-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}/runtimes/pytorch/ubi8-python-3.8" \ + io.openshift.build.image="${IMAGE_REGISTRY}:runtime-pytorch-ubi8-python-3.8" WORKDIR /opt/app-root/bin diff --git a/runtimes/pytorch/ubi9-python-3.9/Dockerfile b/runtimes/pytorch/ubi9-python-3.9/Dockerfile index 871401e28..e3d47b7e8 100644 --- a/runtimes/pytorch/ubi9-python-3.9/Dockerfile +++ b/runtimes/pytorch/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-runtime-pytorch-ubi9-python-3.9" \ summary="Runtime pytorch notebook image for ODH notebooks" \ description="Runtime pytorch notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \ io.k8s.display-name="Runtime pytorch notebook image for ODH notebooks" \ io.k8s.description="Runtime pytorch 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/runtimes/pytorch/ubi9-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:runtime-pytorch-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}/runtimes/pytorch/ubi9-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:runtime-pytorch-ubi9-python-3.9" WORKDIR /opt/app-root/bin diff --git a/runtimes/tensorflow/ubi8-python-3.8/Dockerfile b/runtimes/tensorflow/ubi8-python-3.8/Dockerfile index 30a84b128..94f0e1226 100644 --- a/runtimes/tensorflow/ubi8-python-3.8/Dockerfile +++ b/runtimes/tensorflow/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-runtime-tensorflow-ubi8-python-3.8" \ summary="Runtime CUDA tensorflow notebook image for ODH notebooks" \ description="Runtime CUDA tensorflow notebook image with base Python 3.8 builder image based on UBI8 for ODH notebooks" \ io.k8s.display-name="Runtime CUDA tensorflow notebook image for ODH notebooks" \ io.k8s.description="Runtime CUDA tensorflow 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/runtimes/tensorflow/ubi8-python-3.8" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-runtime-tensorflow-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}/runtimes/tensorflow/ubi8-python-3.8" \ + io.openshift.build.image="${IMAGE_REGISTRY}:cuda-runtime-tensorflow-ubi8-python-3.8" WORKDIR /opt/app-root/bin diff --git a/runtimes/tensorflow/ubi9-python-3.9/Dockerfile b/runtimes/tensorflow/ubi9-python-3.9/Dockerfile index 6f8412bf3..789b12b64 100644 --- a/runtimes/tensorflow/ubi9-python-3.9/Dockerfile +++ b/runtimes/tensorflow/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-runtime-tensorflow-ubi9-python-3.9" \ summary="Runtime CUDA tensorflow notebook image for ODH notebooks" \ description="Runtime CUDA tensorflow notebook image with base Python 3.9 builder image based on UBI9 for ODH notebooks" \ io.k8s.display-name="Runtime CUDA tensorflow notebook image for ODH notebooks" \ io.k8s.description="Runtime CUDA tensorflow 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/runtimes/tensorflow/ubi9-python-3.9" \ - io.openshift.build.image="quay.io/opendatahub/workbench-images:cuda-runtime-tensorflow-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}/runtimes/tensorflow/ubi9-python-3.9" \ + io.openshift.build.image="${IMAGE_REGISTRY}:cuda-runtime-tensorflow-ubi9-python-3.9" WORKDIR /opt/app-root/bin