Skip to content

Commit 99a8767

Browse files
ysokcursoragent
andcommitted
Update Dockerfile and Tekton to use requirements.<flavor>.txt
Align with the renamed requirements file (requirements.cpu.txt): - Dockerfile.cpu: COPY requirements.${PYLOCK_FLAVOR}.txt as requirements.txt (in both whl-cache and codeserver stages) - Dockerfile.vath: same COPY update - Tekton pull-request.yaml: requirements_files: ["requirements.cpu.txt"] - Tekton push.yaml: same update Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 797d901 commit 99a8767

File tree

7 files changed

+9
-1073
lines changed

7 files changed

+9
-1073
lines changed

.tekton/odh-workbench-codeserver-datascience-cpu-py312-ubi9-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
type: pip
6767
binary:
6868
arch: "x86_64,aarch64,ppc64le"
69-
requirements_files: ["requirements.txt"]
69+
requirements_files: ["requirements.cpu.txt"]
7070
- path: codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode/.vscode/extensions/vscode-selfhost-import-aid
7171
type: npm
7272
- path: codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode/.vscode/extensions/vscode-selfhost-test-provider

.tekton/odh-workbench-codeserver-datascience-cpu-py312-ubi9-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
type: pip
5757
binary:
5858
arch: "x86_64,aarch64,ppc64le"
59-
requirements_files: ["requirements.txt"]
59+
requirements_files: ["requirements.cpu.txt"]
6060
- path: codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode/.vscode/extensions/vscode-selfhost-import-aid
6161
type: npm
6262
- path: codeserver/ubi9-python-3.12/prefetch-input/code-server/lib/vscode/.vscode/extensions/vscode-selfhost-test-provider

codeserver/ubi9-python-3.12/Dockerfile.cpu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ COPY ${CODESERVER_SOURCE_CODE}/pylock.toml ./
204204
# copy requirements and scripts
205205
COPY ${CODESERVER_SOURCE_CODE}/uv.lock.d/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml
206206

207-
# [HERMETIC] requirements.txt is generated by cachi2 from pyproject.toml with pinned hashes.
207+
# [HERMETIC] requirements.<flavor>.txt is generated by create-requirements-lockfile.sh with pinned hashes.
208208
# Previously we used pylock.toml directly; now cachi2 needs requirements.txt format.
209-
COPY ${CODESERVER_SOURCE_CODE}/requirements.txt ./
209+
COPY ${CODESERVER_SOURCE_CODE}/requirements.${PYLOCK_FLAVOR}.txt ./requirements.txt
210210
COPY ${CODESERVER_SOURCE_CODE}/devel_env_setup.sh ./
211211

212212
# [HERMETIC] Install uv + install all Python packages from cachi2 pip cache.
@@ -484,9 +484,9 @@ ENV PYTHONPATH=/opt/app-root/bin/python3
484484
# Install useful packages from pylock file
485485
COPY ${CODESERVER_SOURCE_CODE}/uv.lock.d/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml
486486

487-
# [HERMETIC] Install Python packages from cachi2 pip cache (requirements.txt format).
487+
# [HERMETIC] Install Python packages from cachi2 pip cache (requirements.<flavor>.txt format).
488488
# Previously used pylock.toml; cachi2 prefetch generates requirements.txt with hashes.
489-
COPY ${CODESERVER_SOURCE_CODE}/requirements.txt ./
489+
COPY ${CODESERVER_SOURCE_CODE}/requirements.${PYLOCK_FLAVOR}.txt ./requirements.txt
490490

491491
# Wait for whl-cache stage (builds/caches Python wheels).
492492
COPY --from=whl-cache /tmp/control /dev/null

codeserver/ubi9-python-3.12/Dockerfile.vath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ COPY ${CODESERVER_SOURCE_CODE}/pylock.toml ./
4949
# copy requirements and scripts
5050
COPY ${CODESERVER_SOURCE_CODE}/uv.lock.d/pylock.${PYLOCK_FLAVOR}.toml ./pylock.toml
5151

52-
# [HERMETIC] requirements.txt is generated by cachi2 from pyproject.toml with pinned hashes.
52+
# [HERMETIC] requirements.<flavor>.txt is generated by create-requirements-lockfile.sh with pinned hashes.
5353
# Previously we used pylock.toml directly; now cachi2 needs requirements.txt format.
54-
COPY ${CODESERVER_SOURCE_CODE}/requirements.txt ./
54+
COPY ${CODESERVER_SOURCE_CODE}/requirements.${PYLOCK_FLAVOR}.txt ./requirements.txt
5555
COPY ${CODESERVER_SOURCE_CODE}/devel_env_setup.sh ./
5656

5757
# [HERMETIC] Install uv + install all Python packages (--network=none).

codeserver/ubi9-python-3.12/pylock.toml

Lines changed: 0 additions & 1059 deletions
This file was deleted.

codeserver/ubi9-python-3.12/pyproject.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
# - Upgraded feast ~=0.59.0 (pinned for RHOAI 3.4 compatibility)
77
# - Excluded py-spy on ppc64le (maturin can't fetch crates.io in --network=none)
88
# - Added urllib3>=2.6.0 override (CVE-2025-66418)
9-
# - Upgraded feast ~=0.59.0 (pinned for RHOAI 3.4 compatibility)
10-
# - Excluded py-spy on ppc64le (maturin can't fetch crates.io in --network=none)
11-
# - Expanded environments[] to list each arch separately (needed for per-arch resolution)
12-
# - Added numpy version cap override (scikit-learn build-system.requires: numpy<2.4.0)
13-
# - Added onnx version pin to 1.20.0 (RHOAI provides pre-built wheels for all arches)
149
# - Added local path source for the meta-package
1510
[project]
1611
name = "notebooks"

codeserver/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)