Merge remote-tracking branch 'upstream/main' into rhoai-3.0

Author: CFSNM

codeserver/ubi9-python-3.12/nginx/serverconf/proxy.conf.template_nbprefix

@@ -2,12 +2,12 @@
 # api calls from probes get to code-server /healthz endpoint
 ###############
 location = ${NB_PREFIX}/api {
-    return 302  /codeserver/healthz/;
+    return 302  ${NB_PREFIX}/codeserver/healthz/;
     access_log  off;
 }
 
 location ${NB_PREFIX}/api/ {
-    return 302  /codeserver/healthz/;
+    return 302  ${NB_PREFIX}/codeserver/healthz/;
     access_log  off;
 }
 ###############
@@ -16,12 +16,12 @@ location ${NB_PREFIX}/api/ {
 # api calls from culler get to CGI processing
 ###############
 location = ${NB_PREFIX}/api/kernels {
-    return 302 $custom_scheme://$http_host/api/kernels/;
+    return 302 $custom_scheme://$http_host${NB_PREFIX}/api/kernels/;
     access_log  off;
 }
 
 location ${NB_PREFIX}/api/kernels/ {
-    return 302 $custom_scheme://$http_host/api/kernels/;
+    return 302 $custom_scheme://$http_host${NB_PREFIX}/api/kernels/;
     access_log  off;
 }
 
@@ -39,32 +39,34 @@ location /api/kernels/ {
 ###############
 # root and prefix get to code-server endpoint
 ###############
-location = ${NB_PREFIX} {
-    return 302 $custom_scheme://$http_host/codeserver/;
-}
-
-location ${NB_PREFIX}/ {
-    return 302 $custom_scheme://$http_host/codeserver/;
+location ${NB_PREFIX} {
+    return 302 $custom_scheme://$http_host${NB_PREFIX}/codeserver/;
 }
 
 location = /codeserver {
-    return 302 $custom_scheme://$http_host/codeserver/;
+    return 302 $custom_scheme://$http_host${NB_PREFIX}/codeserver/;
 }
 
 location = / {
-    return 302 $custom_scheme://$http_host/codeserver/;
+    return 302 $custom_scheme://$http_host${NB_PREFIX}/codeserver/;
 }
 
-location /codeserver/ {
-    rewrite ^/codeserver/(.*)$ /$1 break;
-    # Standard RStudio/NGINX configuration
+location ${NB_PREFIX}/codeserver/ {
+    rewrite ^${NB_PREFIX}/codeserver/(.*)$ /$1 break;
+    # Standard code-server/NGINX configuration
     proxy_pass http://workbench_server/;
     proxy_http_version 1.1;
-
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $connection_upgrade;
     proxy_read_timeout 20d;
+
+    # Needed to make it work properly
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $custom_scheme;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-NginX-Proxy true;
+    proxy_redirect off;
 
     access_log /var/log/nginx/codeserver.access.log json if=$loggable;
 }

codeserver/ubi9-python-3.12/pylock.toml

@@ -9,14 +9,14 @@ dependencies = [
     "setuptools~=80.9.0",
 
     # Datascience packages
-    "boto3~=1.40.27",
+    "boto3~=1.40.52",
     "kafka-python-ng~=2.2.3",
-    "matplotlib~=3.10.6",
-    "numpy~=2.3.3",
-    "pandas~=2.3.2",
-    "plotly~=6.3.0",
+    "matplotlib~=3.10.7",
+    "numpy~=2.3.4",
+    "pandas~=2.3.3",
+    "plotly~=6.3.1",
     "scikit-learn~=1.7.2",
-    "scipy~=1.16.1",
+    "scipy~=1.16.2",
     "skl2onnx~=1.19.1; platform_machine != 's390x'",
     "ipykernel~=6.30.1",
     "kubeflow-training==1.9.3",
@@ -25,9 +25,9 @@ dependencies = [
     # Some extra useful packages
     "opencensus~=0.11.4",
     "smart-open~=7.3.1",
-    "virtualenv~=20.34.0",
+    "virtualenv~=20.35.3",
     "py-spy~=0.4.1; platform_machine != 's390x'",
-    "prometheus-client~=0.22.1",
+    "prometheus-client~=0.23.1",
 ]
 
 [tool.uv]

codeserver/ubi9-python-3.12/pyproject.toml

@@ -18,7 +18,11 @@ fi
 if [ -z "$NB_PREFIX" ]; then
     cp /opt/app-root/etc/nginx.default.d/proxy.conf.template /opt/app-root/etc/nginx.default.d/proxy.conf
 else
-    export BASE_URL=$(echo $NB_PREFIX | awk -F/ '{ print $4"-"$3 }')$(echo $NOTEBOOK_ARGS | grep -Po 'hub_host":"\K.*?(?=")' | awk -F/ '{ print $3 }' | awk -F. '{for (i=2; i<=NF; i++) printf ".%s", $i}')
+    export BASE_URL=$(echo "$NB_PREFIX" | awk -F/ '{ print $4"-"$3 }')$(echo "$NOTEBOOK_ARGS" | grep -Po 'hub_host":"\K.*?(?=")' | awk -F/ '{ print $3 }' | awk -F. '{for (i=2; i<=NF; i++) printf ".%s", $i}')
+    # If BASE_URL is empty or invalid (missing hub_host), use wildcard server_name
+    if [ -z "$BASE_URL" ] || [ "$BASE_URL" = "$(echo "$NB_PREFIX" | awk -F/ '{ print $4"-"$3 }')" ]; then
+        export BASE_URL="_"
+    fi
     envsubst '${NB_PREFIX},${BASE_URL}' < /opt/app-root/etc/nginx.default.d/proxy.conf.template_nbprefix > /opt/app-root/etc/nginx.default.d/proxy.conf
     envsubst '${BASE_URL}' < /etc/nginx/nginx.conf | tee /etc/nginx/nginx.conf
 fi

codeserver/ubi9-python-3.12/run-nginx.sh

@@ -136,6 +136,8 @@ RUN --mount=type=cache,target=/root/.cache/pip \
               -DARROW_WITH_LZ4=OFF \
               -DARROW_WITH_ZSTD=OFF \
               -DARROW_WITH_SNAPPY=OFF \
+              -DARROW_S3=ON \
+              -DARROW_SUBSTRAIT=ON \
               -DARROW_BUILD_TESTS=OFF \
               -DARROW_BUILD_BENCHMARKS=OFF \
               .. && \