Skip to content

Commit 1aa0540

Browse files
jiridanekjiridanek
committed
Merge remote-tracking branch 'upstream/main'
2 parents 3a59e5e + 01b4ff6 commit 1aa0540

File tree

256 files changed

+64197
-124077
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+64197
-124077
lines changed

‎.github/workflows/piplock-renewal.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ jobs:
6767
python-version: ${{ matrix.python-version }}
6868

6969
- name: Install pipenv
70-
run: pip install pipenv
70+
run: pip install "pipenv==2025.0.4"
71+
72+
- name: Install uv
73+
run: pip install "uv==0.8.12"
7174

7275
- name: Run make refresh-pipfilelock-files
7376
run: |

‎.github/workflows/pr-merge-image-delete.yml

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,30 @@ jobs:
6060
set +e # Don't abort if a delete operation fails as all images might not be available for the PR
6161
6262
# Python 3.11
63-
skopeo delete docker://${QUAY_IMAGE_REPO}:base-ubi9-python-3.11-pr-${{ env.PR }}
64-
skopeo delete docker://${QUAY_IMAGE_REPO}:base-c9s-python-3.11-pr-${{ env.PR }}
65-
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-ubi9-python-3.11-pr-${{ env.PR }}
66-
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-c9s-python-3.11-pr-${{ env.PR }}
67-
skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-minimal-ubi9-python-3.11-pr-${{ env.PR }}
68-
skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-ubi9-python-3.11-pr-${{ env.PR }}
69-
skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-pytorch-ubi9-python-3.11-pr-${{ env.PR }}
70-
skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-trustyai-ubi9-python-3.11-pr-${{ env.PR }}
71-
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-minimal-ubi9-python-3.11-pr-${{ env.PR }}
72-
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-datascience-ubi9-python-3.11-pr-${{ env.PR }}
73-
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-tensorflow-ubi9-python-3.11-pr-${{ env.PR }}
74-
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-minimal-ubi9-python-3.11-pr-${{ env.PR }}
75-
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-datascience-ubi9-python-3.11-pr-${{ env.PR }}
76-
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-pytorch-ubi9-python-3.11-pr-${{ env.PR }}
77-
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-cuda-tensorflow-ubi9-python-3.11-pr-${{ env.PR }}
78-
skopeo delete docker://${QUAY_IMAGE_REPO}:codeserver-ubi9-python-3.11-pr-${{ env.PR }}
7963
skopeo delete docker://${QUAY_IMAGE_REPO}:rstudio-c9s-python-3.11-pr-${{ env.PR }}
8064
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-rstudio-c9s-python-3.11-pr-${{ env.PR }}
81-
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-ubi9-python-3.11-pr-${{ env.PR }}
82-
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-minimal-ubi9-python-3.11-pr-${{ env.PR }}
83-
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-datascience-ubi9-python-3.11-pr-${{ env.PR }}
84-
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-tensorflow-ubi9-python-3.11-pr-${{ env.PR }}
85-
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-pytorch-ubi9-python-3.11-pr-${{ env.PR }}
86-
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-rocm-pytorch-ubi9-python-3.11-pr-${{ env.PR }}
87-
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-rocm-tensorflow-ubi9-python-3.11-pr-${{ env.PR }}
65+
66+
# Python 3.12
67+
skopeo delete docker://${QUAY_IMAGE_REPO}:base-ubi9-python-3.12-pr-${{ env.PR }}
68+
skopeo delete docker://${QUAY_IMAGE_REPO}:base-c9s-python-3.12-pr-${{ env.PR }}
69+
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-ubi9-python-3.12-pr-${{ env.PR }}
70+
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-c9s-python-3.12-pr-${{ env.PR }}
71+
skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-minimal-ubi9-python-3.12-pr-${{ env.PR }}
72+
skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-ubi9-python-3.12-pr-${{ env.PR }}
73+
skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-pytorch-ubi9-python-3.12-pr-${{ env.PR }}
74+
skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-trustyai-ubi9-python-3.12-pr-${{ env.PR }}
75+
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-minimal-ubi9-python-3.12-pr-${{ env.PR }}
76+
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-datascience-ubi9-python-3.12-pr-${{ env.PR }}
77+
skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-tensorflow-ubi9-python-3.12-pr-${{ env.PR }}
78+
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-minimal-ubi9-python-3.12-pr-${{ env.PR }}
79+
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-datascience-ubi9-python-3.12-pr-${{ env.PR }}
80+
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-pytorch-ubi9-python-3.12-pr-${{ env.PR }}
81+
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-cuda-tensorflow-ubi9-python-3.12-pr-${{ env.PR }}
82+
skopeo delete docker://${QUAY_IMAGE_REPO}:codeserver-ubi9-python-3.12-pr-${{ env.PR }}
83+
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-ubi9-python-3.12-pr-${{ env.PR }}
84+
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-minimal-ubi9-python-3.12-pr-${{ env.PR }}
85+
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-datascience-ubi9-python-3.12-pr-${{ env.PR }}
86+
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-tensorflow-ubi9-python-3.12-pr-${{ env.PR }}
87+
skopeo delete docker://${QUAY_IMAGE_REPO}:rocm-jupyter-pytorch-ubi9-python-3.12-pr-${{ env.PR }}
88+
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-rocm-pytorch-ubi9-python-3.12-pr-${{ env.PR }}
89+
skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-rocm-tensorflow-ubi9-python-3.12-pr-${{ env.PR }}

‎Makefile

Lines changed: 7 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ endif
2020

2121
IMAGE_REGISTRY ?= quay.io/opendatahub/workbench-images
2222
RELEASE ?= 2025a
23-
RELEASE_PYTHON_VERSION ?= 3.11
23+
RELEASE_PYTHON_VERSION ?= 3.12
2424
# additional user-specified caching parameters for $(CONTAINER_ENGINE) build
2525
CONTAINER_BUILD_CACHE_ARGS ?= --no-cache
2626
# whether to push the images to a registry as they are built
@@ -402,22 +402,8 @@ PYTHON_VERSION ?= 3.11
402402
ROOT_DIR := $(shell pwd)
403403
ifeq ($(PYTHON_VERSION), 3.11)
404404
BASE_DIRS := \
405-
jupyter/minimal/ubi9-python-$(PYTHON_VERSION) \
406-
jupyter/datascience/ubi9-python-$(PYTHON_VERSION) \
407-
jupyter/pytorch/ubi9-python-$(PYTHON_VERSION) \
408-
jupyter/tensorflow/ubi9-python-$(PYTHON_VERSION) \
409-
jupyter/trustyai/ubi9-python-$(PYTHON_VERSION) \
410-
jupyter/rocm/tensorflow/ubi9-python-$(PYTHON_VERSION) \
411-
jupyter/rocm/pytorch/ubi9-python-$(PYTHON_VERSION) \
412-
codeserver/ubi9-python-$(PYTHON_VERSION) \
413405
rstudio/rhel9-python-$(PYTHON_VERSION) \
414-
rstudio/c9s-python-$(PYTHON_VERSION) \
415-
runtimes/minimal/ubi9-python-$(PYTHON_VERSION) \
416-
runtimes/datascience/ubi9-python-$(PYTHON_VERSION) \
417-
runtimes/pytorch/ubi9-python-$(PYTHON_VERSION) \
418-
runtimes/tensorflow/ubi9-python-$(PYTHON_VERSION) \
419-
runtimes/rocm-tensorflow/ubi9-python-$(PYTHON_VERSION) \
420-
runtimes/rocm-pytorch/ubi9-python-$(PYTHON_VERSION)
406+
rstudio/c9s-python-$(PYTHON_VERSION)
421407
else ifeq ($(PYTHON_VERSION), 3.12)
422408
BASE_DIRS := \
423409
jupyter/minimal/ubi9-python-$(PYTHON_VERSION) \
@@ -462,12 +448,12 @@ refresh-pipfilelock-files:
462448
echo "Processing directory: $$dir"
463449
cd $(ROOT_DIR)
464450
if [ -d "$$dir" ]; then
465-
echo "Updating $(PYTHON_VERSION) Pipfile.lock in $$dir"
451+
echo "Updating $(PYTHON_VERSION) uv.lock in $$dir"
466452
cd $$dir
467-
if [ -f "Pipfile" ]; then
468-
pipenv lock || pipenv lock --verbose
453+
if [ -f "pyproject.toml" ]; then
454+
uv lock && rm uv.lock
469455
else
470-
echo "No Pipfile found in $$dir, skipping."
456+
echo "No pyproject.toml found in $$dir, skipping."
471457
fi
472458
else
473459
echo "Skipping $$dir as it does not exist"
@@ -489,26 +475,8 @@ scan-image-vulnerabilities:
489475
.PHONY: all-images
490476
ifeq ($(RELEASE_PYTHON_VERSION), 3.11)
491477
all-images: \
492-
jupyter-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
493-
jupyter-datascience-ubi9-python-$(RELEASE_PYTHON_VERSION) \
494-
cuda-jupyter-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
495-
cuda-jupyter-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
496-
cuda-jupyter-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
497-
jupyter-trustyai-ubi9-python-$(RELEASE_PYTHON_VERSION) \
498-
runtime-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
499-
runtime-datascience-ubi9-python-$(RELEASE_PYTHON_VERSION) \
500-
runtime-cuda-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
501-
runtime-cuda-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
502-
codeserver-ubi9-python-$(RELEASE_PYTHON_VERSION) \
503478
rstudio-c9s-python-$(RELEASE_PYTHON_VERSION) \
504-
cuda-rstudio-c9s-python-$(RELEASE_PYTHON_VERSION) \
505-
rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION) \
506-
cuda-rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION) \
507-
rocm-jupyter-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \
508-
rocm-jupyter-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION) \
509-
rocm-jupyter-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
510-
rocm-runtime-pytorch-ubi9-python-$(RELEASE_PYTHON_VERSION) \
511-
rocm-runtime-tensorflow-ubi9-python-$(RELEASE_PYTHON_VERSION)
479+
rstudio-rhel9-python-$(RELEASE_PYTHON_VERSION)
512480
else ifeq ($(RELEASE_PYTHON_VERSION), 3.12)
513481
all-images: \
514482
jupyter-minimal-ubi9-python-$(RELEASE_PYTHON_VERSION) \

‎codeserver/ubi9-python-3.11/Dockerfile.cpu

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

‎codeserver/ubi9-python-3.11/Pipfile

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

0 commit comments

Comments
 (0)