RHAIENG-2189: configure PIP_INDEX_URL

jiridanek · jiridanek · commit fa448ac01868 · 2025-12-09T19:15:44.000+01:00
diff --git a/codeserver/ubi9-python-3.12/Dockerfile.cpu b/codeserver/ubi9-python-3.12/Dockerfile.cpu
@@ -72,9 +72,10 @@ FROM ${BASE_IMAGE} AS cpu-base
 
 WORKDIR /opt/app-root/bin
 
-# RHAIENG-2189: this is AIPCC migration phase 1.5
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
 ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
 ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
 
 # OS Packages needs to be installed as root
 USER 0
diff --git a/jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu b/jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu
@@ -268,6 +268,11 @@ ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.12
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 COPY ${JUPYTER_REUSABLE_UTILS} utils/
 COPY ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
 
diff --git a/jupyter/minimal/ubi9-python-3.12/Dockerfile.cpu b/jupyter/minimal/ubi9-python-3.12/Dockerfile.cpu
@@ -11,9 +11,10 @@ FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
 ####################
 FROM ${BASE_IMAGE} AS cpu-base
 
-# RHAIENG-2189: this is AIPCC migration phase 1.5
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
 ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
 ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
 
 WORKDIR /opt/app-root/bin
 
diff --git a/jupyter/minimal/ubi9-python-3.12/Dockerfile.cuda b/jupyter/minimal/ubi9-python-3.12/Dockerfile.cuda
@@ -10,6 +10,11 @@ ARG BASE_IMAGE
 ####################
 FROM ${BASE_IMAGE} AS cuda-base
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 WORKDIR /opt/app-root/bin
 
 # OS Packages needs to be installed as root
diff --git a/jupyter/minimal/ubi9-python-3.12/Dockerfile.rocm b/jupyter/minimal/ubi9-python-3.12/Dockerfile.rocm
@@ -8,6 +8,11 @@ ARG BASE_IMAGE
 ####################
 FROM ${BASE_IMAGE} AS rocm-base
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 WORKDIR /opt/app-root/bin
 
 # OS Packages needs to be installed as root
diff --git a/jupyter/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.cuda b/jupyter/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.cuda
@@ -141,6 +141,11 @@ ARG PYTORCH_SOURCE_CODE=jupyter/pytorch+llmcompressor/ubi9-python-3.12
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 LABEL name="odh-notebook-jupyter-cuda-pytorch-llmcompressor-ubi9-python-3.12" \
     summary="Jupyter CUDA pytorch-llmcompressor notebook image for ODH notebooks" \
     description="Jupyter CUDA pytorch-llmcompressor notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
diff --git a/jupyter/pytorch/ubi9-python-3.12/Dockerfile.cuda b/jupyter/pytorch/ubi9-python-3.12/Dockerfile.cuda
@@ -141,6 +141,11 @@ ARG PYTORCH_SOURCE_CODE=jupyter/pytorch/ubi9-python-3.12
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 LABEL name="odh-notebook-jupyter-cuda-pytorch-ubi9-python-3.12" \
     summary="Jupyter CUDA pytorch notebook image for ODH notebooks" \
     description="Jupyter CUDA pytorch notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
diff --git a/jupyter/rocm/pytorch/ubi9-python-3.12/Dockerfile.rocm b/jupyter/rocm/pytorch/ubi9-python-3.12/Dockerfile.rocm
@@ -109,6 +109,11 @@ ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 # OS Packages needs to be installed as root
 USER root
 
diff --git a/jupyter/rocm/tensorflow/ubi9-python-3.12/Dockerfile.rocm b/jupyter/rocm/tensorflow/ubi9-python-3.12/Dockerfile.rocm
@@ -109,6 +109,11 @@ ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 # OS Packages needs to be installed as root
 USER root
 
diff --git a/jupyter/tensorflow/ubi9-python-3.12/Dockerfile.cuda b/jupyter/tensorflow/ubi9-python-3.12/Dockerfile.cuda
@@ -111,6 +111,11 @@ ARG DATASCIENCE_SOURCE_CODE=jupyter/datascience/ubi9-python-3.12
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 # OS Packages needs to be installed as root
 USER root
 
diff --git a/jupyter/trustyai/ubi9-python-3.12/Dockerfile.cpu b/jupyter/trustyai/ubi9-python-3.12/Dockerfile.cpu
@@ -166,6 +166,11 @@ ARG TRUSTYAI_SOURCE_CODE=jupyter/trustyai/ubi9-python-3.12
 
 ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 LABEL name="odh-notebook-jupyter-trustyai-ubi9-python-3.12" \
     summary="Jupyter trustyai notebook image for ODH notebooks" \
     description="Jupyter trustyai notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
diff --git a/rstudio/c9s-python-3.12/Dockerfile.cpu b/rstudio/c9s-python-3.12/Dockerfile.cpu
@@ -12,6 +12,11 @@ FROM ${BASE_IMAGE} AS cpu-base
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 ### BEGIN Install micropipenv and uv to deploy packages from requirements.txt
 RUN pip install --no-cache-dir --extra-index-url https://pypi.org/simple -U "micropipenv[toml]==1.9.0" "uv==0.9.6"
 ### END Install micropipenv and uv to deploy packages from requirements.txt
diff --git a/rstudio/c9s-python-3.12/Dockerfile.cuda b/rstudio/c9s-python-3.12/Dockerfile.cuda
@@ -12,6 +12,11 @@ FROM ${BASE_IMAGE} AS cuda-base
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 # OS Packages needs to be installed as root
 USER root
 
diff --git a/rstudio/rhel9-python-3.12/Dockerfile.cpu b/rstudio/rhel9-python-3.12/Dockerfile.cpu
@@ -12,6 +12,11 @@ FROM ${BASE_IMAGE} AS cpu-base
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 # OS Packages needs to be installed as root
 USER root
 
diff --git a/rstudio/rhel9-python-3.12/Dockerfile.cuda b/rstudio/rhel9-python-3.12/Dockerfile.cuda
@@ -12,6 +12,11 @@ FROM ${BASE_IMAGE} AS cuda-base
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 # OS Packages needs to be installed as root
 USER root
 
diff --git a/runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu b/runtimes/datascience/ubi9-python-3.12/Dockerfile.cpu
@@ -10,9 +10,10 @@ FROM ${BASE_IMAGE} AS cpu-base
 
 ARG TARGETARCH
 
-# RHAIENG-2189: this is AIPCC migration phase 1.5
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
 ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
 ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/minimal/ubi9-python-3.12/Dockerfile.cpu b/runtimes/minimal/ubi9-python-3.12/Dockerfile.cpu
@@ -8,9 +8,10 @@ ARG BASE_IMAGE
 ####################
 FROM ${BASE_IMAGE} AS cpu-base
 
-# RHAIENG-2189: this is AIPCC migration phase 1.5
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
 ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
 ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
 
 WORKDIR /opt/app-root/bin
 
diff --git a/runtimes/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.cuda b/runtimes/pytorch+llmcompressor/ubi9-python-3.12/Dockerfile.cuda
@@ -65,6 +65,11 @@ FROM cuda-base AS cuda-runtime-pytorch
 
 ARG PYTORCH_SOURCE_CODE=runtimes/pytorch+llmcompressor/ubi9-python-3.12
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 LABEL name="odh-notebook-runtime-cuda-pytorch-llmcompressor-ubi9-python-3.12" \
     summary="Runtime CUDA pytorch-llmcompressor notebook image for ODH notebooks" \
     description="Runtime CUDA pytorch-llmcompressor notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
diff --git a/runtimes/pytorch/ubi9-python-3.12/Dockerfile.cuda b/runtimes/pytorch/ubi9-python-3.12/Dockerfile.cuda
@@ -77,6 +77,11 @@ LABEL name="odh-notebook-runtime-pytorch-ubi9-python-3.12" \
 
 WORKDIR /opt/app-root/bin
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 # Install Python packages from requirements.txt
 COPY ${PYTORCH_SOURCE_CODE}/pylock.toml ./
 # Copy Elyra dependencies for air-gapped enviroment
diff --git a/runtimes/rocm-pytorch/ubi9-python-3.12/Dockerfile.rocm b/runtimes/rocm-pytorch/ubi9-python-3.12/Dockerfile.rocm
@@ -63,6 +63,11 @@ FROM rocm-base AS rocm-runtime-pytorch
 
 ARG PYTORCH_SOURCE_CODE=runtimes/rocm-pytorch/ubi9-python-3.12
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 LABEL name="odh-notebook-runtime-rocm-pytorch-ubi9-python-3.12" \
     summary="Runtime ROCm pytorch notebook image for ODH notebooks" \
     description="Runtime ROCm pytorch notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
diff --git a/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm b/runtimes/rocm-tensorflow/ubi9-python-3.12/Dockerfile.rocm
@@ -64,6 +64,11 @@ FROM rocm-base AS rocm-runtime-tensorflow
 ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
 ARG TENSORFLOW_SOURCE_CODE=runtimes/rocm-tensorflow/ubi9-python-3.12
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 LABEL name="odh-notebook-rocm-runtime-tensorflow-ubi9-python-3.12" \
     summary="Runtime ROCm tensorflow notebook image for ODH notebooks" \
     description="Runtime ROCm tensorflow notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
diff --git a/runtimes/tensorflow/ubi9-python-3.12/Dockerfile.cuda b/runtimes/tensorflow/ubi9-python-3.12/Dockerfile.cuda
@@ -68,6 +68,11 @@ FROM cuda-base AS cuda-runtime-tensorflow
 ARG JUPYTER_REUSABLE_UTILS=jupyter/utils
 ARG TENSORFLOW_SOURCE_CODE=runtimes/tensorflow/ubi9-python-3.12
 
+### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
+ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
+### END RHAIENG-2189: this is AIPCC migration phase 1.5
+
 LABEL name="odh-notebook-cuda-runtime-tensorflow-ubi9-python-3.12" \
     summary="Runtime CUDA tensorflow notebook image for ODH notebooks" \
     description="Runtime CUDA tensorflow notebook image with base Python 3.12 builder image based on UBI9 for ODH notebooks" \
diff --git a/scripts/dockerfile_fragments.py b/scripts/dockerfile_fragments.py
@@ -61,6 +61,10 @@ def main():
     """)
 
     replacements = {
+        "RHAIENG-2189: this is AIPCC migration phase 1.5": textwrap.dedent(r"""
+            ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+            ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple"""),
+
         "Subscribe with subscription manager": textwrap.dedent(subscription_manager_register_refresh),
         "upgrade first to avoid fixable vulnerabilities": textwrap.dedent(ntb.process_template_with_indents(rt"""
             {subscription_manager_register_refresh}
diff --git a/tests/containers/base_image_test.py b/tests/containers/base_image_test.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import binascii
+import contextlib
 import inspect
 import json
 import logging
@@ -11,6 +12,7 @@
 import textwrap
 from typing import TYPE_CHECKING, Any
 
+import allure
 import pytest
 import testcontainers.core.container
 
@@ -20,7 +22,7 @@
 LOGGER = logging.getLogger(__name__)
 
 if TYPE_CHECKING:
-    from collections.abc import Callable
+    from collections.abc import Callable, Generator
 
     import pytest_subtests
 
@@ -43,6 +45,23 @@ def _run_test(self, image: str, test_fn: Callable[[testcontainers.core.container
         # If the return doesn't happen in the try block, fail the test
         pytest.fail("The test did not pass as expected.")
 
+    @contextlib.contextmanager
+    def _test_container(self, image: str) -> Generator[testcontainers.core.container.DockerContainer]:
+        """Context manager that starts a test container and yields it."""
+        container = testcontainers.core.container.DockerContainer(image=image, user=23456, group_add=[0])
+        container.with_command("/bin/sh -c 'sleep infinity'")
+        try:
+            container.start()
+            yield container
+            return
+        except Exception as e:
+            pytest.fail(f"Unexpected exception in test: {e}")
+        finally:
+            docker_utils.NotebookContainer(container).stop(timeout=0)
+
+        # If the return doesn't happen in the try block, fail the test
+        pytest.fail("The test did not pass as expected.")
+
     def test_elf_files_can_link_runtime_libs(self, subtests: pytest_subtests.SubTests, image):
         def test_fn(container: testcontainers.core.container.DockerContainer):
             def check_elf_file():
@@ -250,6 +269,28 @@ def test_fn(container: testcontainers.core.container.DockerContainer):
 
         self._run_test(image=image, test_fn=test_fn)
 
+    @allure.issue("RHAIENG-2189")
+    def test_python_package_index(self, image: str, subtests: pytest_subtests.SubTests):
+        """Checks that we use the Python Package Index we mean to use.
+        https://redhat-internal.slack.com/archives/C05TTTYG599/p1764240587118899?thread_ts=1764234802.564119&cid=C05TTTYG599
+        """
+
+        expected_env = {
+            "PIP_EXTRA_INDEX_URL": "https://pypi.org/simple",
+            "UV_EXTRA_INDEX_URL": "https://pypi.org/simple",
+        }
+
+        with self._test_container(image=image) as container:
+            _, output = container.exec(["env"])
+            output = output.decode().strip()
+
+            actual = {}
+            for line in output.splitlines():
+                key, value = line.split("=", maxsplit=1)
+                actual[key] = value
+
+            assert actual.items() >= expected_env.items()
+
 
 def encode_python_function_execution_command_interpreter(
     python: str, function: Callable[..., Any], *args: list[Any]
