Merge branch 'development' into 'master'

Update code-server and switch channel for OpenCV

See merge request !35

keras3-cpu/Dockerfile

@@ -24,7 +24,7 @@ USER ${NB_UID}
 
 # R packages including IRKernel which gets installed globally.
 # r-e1071: dependency of the caret R package
-RUN mamba install --yes --no-update-deps \
+RUN mamba install --yes \
     # for VS code
     'r-languageserver' \
     'radian' \
@@ -57,7 +57,7 @@ RUN mamba install --yes --no-update-deps \
 USER root
 
 # install code-server and extensions
-ENV CODE_VERSION=4.93.1
+ENV CODE_VERSION=4.95.2
 RUN wget --no-hsts -q https://github.com/coder/code-server/releases/download/v$CODE_VERSION/code-server_${CODE_VERSION}_amd64.deb && \
     dpkg -i code-server_${CODE_VERSION}_amd64.deb && \
     rm -f code-server_${CODE_VERSION}_amd64.deb && \
@@ -122,8 +122,8 @@ RUN mamba install --yes \
     'jupyter-archive' \
     'jupyterlab-git' \
     'jupyter-resource-usage' \
-    # install opencv via fastai, headless version not available in conda-forge
-    'fastai::opencv-python-headless' && \
+    # install opencv headless version
+    'py-opencv=*=headless*' && \
     printf '%s\n' \
            "" \
            "# track CPU usage, prevent known bug with prometheus, set default limits if not set by MEM_LIMIT and CPU_LIMIT" \

keras3-gpu/Dockerfile

@@ -10,7 +10,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 USER root
 
 # install code-server and extensions
-ENV CODE_VERSION=4.93.1
+ENV CODE_VERSION=4.95.2
 RUN wget --no-hsts -q https://github.com/coder/code-server/releases/download/v$CODE_VERSION/code-server_${CODE_VERSION}_amd64.deb && \
     dpkg -i code-server_${CODE_VERSION}_amd64.deb && \
     rm -f code-server_${CODE_VERSION}_amd64.deb && \
@@ -74,8 +74,8 @@ RUN mamba install --yes \
     'jupyterlab_execute_time' \
     'jupyter-archive' \
     'jupyter-resource-usage' \
-    # install opencv via fastai, headless version not available in conda-forge
-    'fastai::opencv-python-headless' && \
+    # install opencv headless version
+    'py-opencv=*=headless*' && \
     printf '%s\n' \
            "" \
            "# track CPU usage, prevent known bug with prometheus, set default limits if not set by MEM_LIMIT and CPU_LIMIT" \
@@ -93,8 +93,6 @@ RUN mamba install --yes \
 RUN pip install --no-cache-dir \
     # gymnasium atari gives conflicts when installed from conda-forge
     gymnasium[atari,box2d,accept-rom-license] && \
-    # install newest version of keras, since Keras3 is quite new and moves fast
-    pip install --no-cache-dir --upgrade keras && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}"
 

pytorch-gpu/Dockerfile

@@ -10,7 +10,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 USER root
 
 # install code-server and extensions
-ENV CODE_VERSION=4.93.1
+ENV CODE_VERSION=4.95.2
 RUN wget --no-hsts -q https://github.com/coder/code-server/releases/download/v$CODE_VERSION/code-server_${CODE_VERSION}_amd64.deb && \
     dpkg -i code-server_${CODE_VERSION}_amd64.deb && \
     rm -f code-server_${CODE_VERSION}_amd64.deb && \
@@ -72,8 +72,8 @@ RUN mamba install --yes --no-update-deps \
     'jupyterlab_execute_time' \
     'jupyter-archive' \
     'jupyter-resource-usage' \
-    # install opencv via fastai, headless version not available in conda-forge
-    'fastai::opencv-python-headless' && \
+    # install opencv headless version
+    'py-opencv=*=headless*' && \
     pip install --no-cache-dir --extra-index-url 'https://pypi.nvidia.com' --extra-index-url 'https://download.pytorch.org/whl/cu118' \
     'transformers' \
     'diffusers' \