Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -517,3 +517,27 @@ test:
@echo "Running quick static tests"
uv run pytest -m 'not buildonlytest'
@./scripts/check_dockerfile_alignment.sh


#This is temporary lock on the final implementation that will covers all the folders should apply smart logic for the locks
CPU_INDEX=https://console.redhat.com/api/pypi/public-rhai/rhoai/3.0/cpu-ubi9/simple/
CUDA_INDEX=https://console.redhat.com/api/pypi/public-rhai/rhoai/3.0/cuda-ubi9/simple/
ROCM_INDEX=https://console.redhat.com/api/pypi/public-rhai/rhoai/3.0/rocm-ubi9/simple/

lock-cuda:
uv pip compile \
--python-platform=linux \
jupyter/minimal/ubi9-python-3.12/pyproject.toml \
--index-url=$(CUDA_INDEX) \
--output-file=jupyter/minimal/ubi9-python-3.12/uv.lock/pylock.cuda.toml \
--python-version=3.12


lock-rocm:
uv pip compile \
--python-platform=linux \
jupyter/minimal/ubi9-python-3.12/pyproject.toml \
--index-url=$(ROCM_INDEX) \
--output-file=jupyter/minimal/ubi9-python-3.12/uv.lock/pylock.rocm.toml \
--python-version=3.12

7 changes: 5 additions & 2 deletions jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.cuda
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,16 @@ ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"

USER 1001

COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
COPY ${MINIMAL_SOURCE_CODE}/uv.lock/pylock.cuda.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./

# Makes available the internal python package index from aipcc on the container runtime
COPY ${MINIMAL_SOURCE_CODE}/cuda-pip.conf /etc/pip.conf

# Install Python dependencies from requirements.txt file
RUN echo "Installing softwares and packages" && \
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.cuda.toml && \
# Disable announcement plugin of jupyterlab \
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
Expand Down
7 changes: 5 additions & 2 deletions jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.rocm
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,16 @@ ENV PATH="/usr/local/texlive/bin/linux:/usr/local/pandoc/bin:$PATH"

USER 1001

COPY ${MINIMAL_SOURCE_CODE}/pylock.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./
COPY ${MINIMAL_SOURCE_CODE}/uv.lock/pylock.rocm.toml ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./

# Makes available the internal python package index from aipcc on the container runtime
COPY ${MINIMAL_SOURCE_CODE}/rocm-pip.conf /etc/pip.conf

# Install Python dependencies from Pipfile.lock file
RUN echo "Installing softwares and packages" && \
# This may have to download and compile some dependencies, and as we don't lock requirements from `build-system.requires`,
# we often don't know the correct hashes and `--require-hashes` would therefore fail on non amd64, where building is common.
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.toml && \
uv pip install --strict --no-deps --no-cache --no-config --no-progress --verify-hashes --compile-bytecode --index-strategy=unsafe-best-match --requirements=./pylock.rocm.toml && \
# Disable announcement plugin of jupyterlab \
jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
# Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
Expand Down
8 changes: 8 additions & 0 deletions jupyter/minimal/ubi9-python-3.12/cuda-pip.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[global]
index-url = https://console.redhat.com/api/pypi/public-rhai/rhoai/3.0/cuda-ubi9/simple/

# Optional fallback (if you *do* want PyPI as backup)
extra-index-url = https://pypi.org/simple/

[install]
trusted-host = console.redhat.com
8 changes: 8 additions & 0 deletions jupyter/minimal/ubi9-python-3.12/rocm-pip.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[global]
index-url = https://console.redhat.com/api/pypi/public-rhai/rhoai/3.0/cuda-ubi9/simple/

# Optional fallback (if you *do* want PyPI as backup)
extra-index-url = https://pypi.org/simple/

[install]
trusted-host = console.redhat.com
Loading
Loading