Merge pull request #727 from opendatahub-io/sync__main__2024b__20241004090436

Sync `2024b` branch with `main` branch

Author: openshift-merge-bot[bot]

Makefile

@@ -629,6 +629,22 @@ refresh-pipfilelock-files:
 	cd runtimes/tensorflow/ubi9-python-3.9 && pipenv lock
 	cd runtimes/rocm-tensorflow/ubi9-python-3.9 && pipenv lock
 	cd runtimes/rocm-pytorch/ubi9-python-3.9 && pipenv lock
+	cd base/c9s-python-3.11 && pipenv lock
+	cd base/ubi9-python-3.11 && pipenv lock
+	cd codeserver/ubi9-python-3.11 && pipenv lock
+	cd jupyter/minimal/ubi9-python-3.11 && pipenv lock
+	cd jupyter/datascience/ubi9-python-3.11 && pipenv lock
+	cd jupyter/pytorch/ubi9-python-3.11 && pipenv lock
+	cd jupyter/tensorflow/ubi9-python-3.11 && pipenv lock
+	cd jupyter/trustyai/ubi9-python-3.11 && pipenv lock
+	cd jupyter/rocm/tensorflow/ubi9-python-3.11 && pipenv lock
+	cd jupyter/rocm/pytorch/ubi9-python-3.11 && pipenv lock
+	cd runtimes/minimal/ubi9-python-3.11 && pipenv lock
+	cd runtimes/datascience/ubi9-python-3.11 && pipenv lock
+	cd runtimes/pytorch/ubi9-python-3.11 && pipenv lock
+	cd runtimes/tensorflow/ubi9-python-3.11 && pipenv lock
+	cd runtimes/rocm-tensorflow/ubi9-python-3.11 && pipenv lock
+	cd runtimes/rocm-pytorch/ubi9-python-3.11 && pipenv lock
 
 
 

codeserver/Extensions.md

@@ -0,0 +1,29 @@
+# Code - Extensions
+
+Our code-server image will provide an easy way for users to deploy a code instance with AI focused extensions.
+
+All extensions can be downloaded from either [https://open-vsx.org](https://open-vsx.org) (preferred) or [https://marketplace.visualstudio.com](https://marketplace.visualstudio.com)
+
+> Detail: some extensions are already available inside of other extensions, that are called "extension packages", i.e., when you install the `ms-python.python` extension, it already comes bundled with the `ms-python.debugpy` extension.
+> 
+> All extension files are available inside the `ubiX-python-Y/utils/` directory, but only the main ones will be installed.
+
+List of extensions used:
+
+- Python [ms-python.python]
+  - Python Debugger [ms-python.debugpy]
+- Jupyter [ms-toolsai.jupyter]
+  - Jupyter Keymap [ms-toolsai.jupyter-keymap]
+  - Jupyter Notebook Renderers [ms-toolsai.jupyter-renderers]
+  - Jupyter Cell Tags [ms-toolsai.vscode-jupyter-cell-tags]
+  - Jupyter Slide Show [ms-toolsai.vscode-jupyter-slideshow]
+
+## Update process
+
+To update the extensions, we suggest running a code-server image locally using Podman and manually checking the extensions tab, in a way that you can identify the version available to the version of code-server that you are running on, since some extensions are not available to some code-server versions.
+
+1. Run a code-server image
+2. Search for the desired extensions on the `extensions` tab
+3. Search for the desired version of the extension that you want to install
+4. Under `Resources`, you can click on `Marketplace` to see more details on `Open VSX Registry`
+  1. On `Open VSX Registry` you can select a specific version or click on `Download` to download the `vsix` file

codeserver/ubi9-python-3.11/Dockerfile

@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
-ARG CODESERVER_VERSION=v4.22.0
+ARG CODESERVER_VERSION=v4.92.2
 
 LABEL name="odh-notebook-code-server-ubi9-python-3.11" \
       summary="code-server image with python 3.11 based on UBI 9" \
@@ -43,9 +43,8 @@ COPY --chown=1001:0 utils utils/
 
 # Create and intall the extensions though build-time on a temporary directory. Later this directory will copied on the `/opt/app-root/src/.local/share/code-server/extensions` via run-code-server.sh file when it starts up.
 RUN mkdir -p /opt/app-root/extensions-temp && \
-    code-server --install-extension /opt/app-root/bin/utils/ms-python.python-2024.2.1.vsix --extensions-dir /opt/app-root/extensions-temp && \
-    code-server --install-extension /opt/app-root/bin/utils/[email protected] --extensions-dir /opt/app-root/extensions-temp && \
-    code-server --install-extension  /opt/app-root/bin/utils/ms-toolsai.jupyter-2023.11.100.vsix --extensions-dir /opt/app-root/extensions-temp
+    code-server --install-extension /opt/app-root/bin/utils/ms-python.python-2024.14.1.vsix --extensions-dir /opt/app-root/extensions-temp && \
+    code-server --install-extension /opt/app-root/bin/utils/ms-toolsai.jupyter-2024.7.0.vsix --extensions-dir /opt/app-root/extensions-temp
 
 # Install NGINX to proxy code-server and pass probes check
 ENV NGINX_VERSION=1.24 \

codeserver/ubi9-python-3.11/README.md

@@ -0,0 +1,20 @@
+# codeserver-ubi9-python-3.11
+
+To run the following image, you can use the following command:
+
+```bash
+$ export QUAY_IO=quay.io/{myuser}/workbench-images
+$ export WORKBENCH_RELEASE=2024b
+$ make codeserver-ubi9-python-3.11 \
+    -e IMAGE_REGISTRY=$QUAY_IO \
+    -e RELEASE=$WORKBENCH_RELEASE \
+    -e PUSH_IMAGES=no \
+    -e CONTAINER_BUILD_CACHE_ARGS=""
+```
+
+To execute with Podman, do as follows:
+
+```bash
+$ export LATEST_TAG=`podman images --format "{{.Repository}}:{{.Tag}}" | grep "$QUAY_IO:codeserver-ubi9-python-3.11-$WORKBENCH_RELEASE" | sort -r | head -n1 | cut -d':' -f2`
+$ podman run -it -p 8787:8787 $QUAY_IO:$LATEST_TAG
+```