Merge branch 'main' into remote-desktop

Author: marcelovilla

.github/workflows/build-push-docker.yaml

@@ -87,6 +87,7 @@ jobs:
           echo "GPU Platform Matrix"
           echo "BASE_IMAGE=$GPU_BASE_IMAGE" >> $GITHUB_ENV
           echo "IMAGE_SUFFIX=-$GPU_IMAGE_SUFFIX" >> $GITHUB_ENV
+          echo "GPU=true" >> $GITHUB_ENV
 
       - name: "Generate Docker images tags 🏷️"
         id: meta
@@ -119,5 +120,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          build-args: BASE_IMAGE=${{ env.BASE_IMAGE }}
+          build-args: |
+            BASE_IMAGE=${{ env.BASE_IMAGE }}
+            GPU=${{ env.GPU }}
           platforms: linux/amd64,linux/arm64

Dockerfile

@@ -1,4 +1,5 @@
-FROM ubuntu:24.04 AS builder
+ARG BASE_IMAGE=ubuntu:24.04
+FROM ${BASE_IMAGE} AS builder
 LABEL MAINTAINER="Nebari development team"
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
@@ -29,9 +30,10 @@ RUN --mount=type=cache,target=/opt/conda/pkgs,sharing=locked \
     --mount=type=cache,target=/root/.cache/pip,sharing=locked \
     /opt/scripts/install-conda-environment.sh /opt/dask-worker/environment.yaml 'false'
 
-ENV LD_LIBRARY_PATH=/usr/local/nvidia/lib64
-ENV NVIDIA_PATH=/usr/local/nvidia/bin
-ENV PATH="$NVIDIA_PATH:$PATH"
+ARG GPU
+ENV LD_LIBRARY_PATH=${GPU:+/usr/local/nvidia/lib64}
+ENV NVIDIA_PATH=${GPU:+/usr/local/nvidia/bin}
+ENV PATH=${GPU:+/usr/local/nvidia/bin:}${PATH}
 
 COPY dask-worker /opt/dask-worker
 RUN /opt/dask-worker/postBuild
@@ -90,12 +92,14 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 # ========== jupyterlab install ===========
 FROM intermediate AS jupyterlab
+ARG GPU
+
 ENV CONDA_DIR=/opt/conda \
     DEFAULT_ENV=default \
-    LD_LIBRARY_PATH=/usr/local/nvidia/lib64 \
-    NVIDIA_PATH=/usr/local/nvidia/bin
+    LD_LIBRARY_PATH=${GPU:+/usr/local/nvidia/lib64} \
+    NVIDIA_PATH=${GPU:+/usr/local/nvidia/bin}
 
-ENV PATH="$NVIDIA_PATH:$PATH"
+ENV PATH=${GPU:+/usr/local/nvidia/bin:}${PATH}
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \

jupyterhub/environment.yaml

@@ -14,4 +14,4 @@ dependencies:
   - pip:
     - nebari-jupyterhub-theme==2024.7.1
     - python-keycloak==0.26.1
-    - jhub-apps==2025.2.1
+    - jhub-apps==2025.8.1

jupyterlab/environment.yaml

@@ -61,7 +61,7 @@ dependencies:
       - git+https://github.com/betatim/vscode-binder
       - jupyterlab_nvdashboard==0.12.0
       - argo-jupyter-scheduler==2024.6.1
-      - jhub-apps@git+https://github.com/nebari-dev/jhub-apps.git@263645da70c2f0a52e1d0f0a9426e5d62f72d2c0
+      - jhub-apps==2025.11.1
       - jupyterlab-nebari-mode==0.3.0
       - jupyterlab-conda-store==2024.11.1
       - jupyterlab-launchpad==1.0.3

scripts/install-code-server.sh

@@ -5,14 +5,14 @@
 set -xe
 DEFAULT_PREFIX="${1}"
 shift # path to environment yaml or lock file
-CODE_SERVER_VERSION=4.23.1
+CODE_SERVER_VERSION=4.104.3
 
 mkdir -p ${DEFAULT_PREFIX}/code-server
 cd ${DEFAULT_PREFIX}/code-server
 
 # Fetch the snapshot of https://code-server.dev/install.sh as of the time of writing
-wget --quiet https://raw.githubusercontent.com/coder/code-server/v4.23.1/install.sh
-expected_sum=ef0324043bc7493989764315e22bbc85c38c4e895549538b7e701948b64495e6
+wget --quiet https://raw.githubusercontent.com/coder/code-server/v4.104.3/install.sh
+expected_sum=e86784e9fec81106c74941e55dbbcb85dc963a06ad6c3f1a870d4a22cf432e1d
 
 if [[ ! $(sha256sum install.sh) == "${expected_sum}  install.sh" ]]; then
     echo Unexpected hash from code-server install script