Merge branch 'main' into renovate/mikefarah-yq-4.x

Author: jameslamb

.github/workflows/publish.yml

@@ -4,7 +4,8 @@ name: publish
 on:
   push:
     branches:
-      - "branch-*"
+      - main
+      - release/*
     tags:
       - v[0-9][0-9].[0-9][0-9].[0-9][0-9]
   workflow_dispatch:

.github/workflows/test-notebooks.yml

@@ -71,7 +71,7 @@ jobs:
     steps:
       - name: Install required tools
         run: |
-          mamba install -n base --freeze-installed \
+          conda install -n base --freeze-installed \
             curl \
             git
       - name: Checkout code
@@ -94,7 +94,7 @@ jobs:
       - name: Install awscli
         if: '!cancelled()'
         run: |
-          rapids-mamba-retry install -n base awscli
+          rapids-conda-retry install -n base awscli
       - uses: aws-actions/configure-aws-credentials@v5
         if: '!cancelled()'
         with:

Dockerfile

@@ -83,6 +83,8 @@ ARG LINUX_VER=notset
 ARG PYTHON_VER=notset
 ARG DEBIAN_FRONTEND=noninteractive
 ENV PATH=/opt/conda/bin:$PATH
+# ensure conda's files and configuration can be found at runtime even if environment activation was bypassed
+ENV CONDA_PREFIX=/opt/conda
 ENV PYTHON_VERSION=${PYTHON_VER}
 
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
@@ -174,7 +176,7 @@ PACKAGES_TO_INSTALL=(
   'ipython>=8.37.0'
   'rapids-cli==0.1.*'
 )
-rapids-mamba-retry install -y -n base \
+rapids-conda-retry install -y -n base \
   "${PACKAGES_TO_INSTALL[@]}"
 
 conda clean -afy
@@ -204,7 +206,7 @@ COPY --from=dependencies --chown=rapids /test_notebooks_dependencies.yaml test_n
 COPY --from=dependencies --chown=rapids /notebooks /home/rapids/notebooks
 
 RUN <<EOF
-rapids-mamba-retry env update -n base -f test_notebooks_dependencies.yaml
+rapids-conda-retry env update -n base -f test_notebooks_dependencies.yaml
 conda clean -afy
 EOF
 
@@ -214,7 +216,7 @@ PACKAGES_TO_INSTALL=(
   'dask-labextension>=7.0.0'
   'jupyterlab-nvdashboard>=0.13.0'
 )
-rapids-mamba-retry install -y -n base \
+rapids-conda-retry install -y -n base \
   "${PACKAGES_TO_INSTALL[@]}"
 conda clean -afy
 EOF

context/entrypoint.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
-# Copyright (c) 2023-2025, NVIDIA CORPORATION.
+#!/usr/bin/env -S bash -l
+# Copyright (c) 2023-2026, NVIDIA CORPORATION.
 
 set -eo pipefail
 
@@ -10,14 +10,17 @@ https://developer.download.nvidia.com/licenses/NVIDIA_Deep_Learning_Container_Li
 
 EOF
 
+# Activate conda (login shell sources from /etc/profile.d/conda.sh)
+conda activate
+
 if [ -e "/home/rapids/environment.yml" ]; then
     echo "environment.yml found. Installing packages."
-    timeout ${CONDA_TIMEOUT:-600} mamba env update -n base -y -f /home/rapids/environment.yml || exit $?
+    timeout ${CONDA_TIMEOUT:-600} conda env update -n base -y -f /home/rapids/environment.yml || exit $?
 fi
 
 if [ "$EXTRA_CONDA_PACKAGES" ]; then
     echo "EXTRA_CONDA_PACKAGES environment variable found. Installing packages."
-    timeout ${CONDA_TIMEOUT:-600} mamba install -n base -y $EXTRA_CONDA_PACKAGES || exit $?
+    timeout ${CONDA_TIMEOUT:-600} conda install -n base -y $EXTRA_CONDA_PACKAGES || exit $?
 fi
 
 if [ "$EXTRA_PIP_PACKAGES" ]; then

context/scripts/configure-conda-base-environment

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright (c) 2026, NVIDIA CORPORATION.
 
 # [description]
 #
@@ -33,8 +34,8 @@ if [[ "$PYTHON_VERSION_PADDED" > "3.12" ]]; then
 else
     PYTHON_ABI_TAG="cpython"
 fi
-rapids-mamba-retry install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}"
-rapids-mamba-retry update --all -y -n base
+rapids-conda-retry install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}"
+rapids-conda-retry update --all -y -n base
 find /opt/conda -follow -type f -name '*.a' -delete
 find /opt/conda -follow -type f -name '*.pyc' -delete
 

context/scripts/update-base-conda-environment

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Copyright (c) 2026, NVIDIA CORPORATION.
 
 set -e -u -o pipefail
 
@@ -14,7 +15,7 @@ SCRIPT_DIR="$(dirname "$(realpath "${BASH_SOURCE[0]}")")"
 # Ensure new files/dirs have group write permissions
 umask 002
 
-# install gha-tools for rapids-mamba-retry
+# install gha-tools for rapids-conda-retry
 "${SCRIPT_DIR}/install-gha-tools"
 
 # Example of pinned package in case you require an override
@@ -23,7 +24,7 @@ umask 002
 # update everything before other environment changes, to ensure mixing
 # an older conda with newer packages still works well
 PATH="/opt/conda/bin:$PATH" \
-  rapids-mamba-retry update --all -y -n base
+  rapids-conda-retry update --all -y -n base
 
 # clean up the package cache and other unused files, to minimize
 # what's copied into later images

cuvs-bench/README.md

@@ -9,7 +9,7 @@ These images are meant to enable end users of cuVS ANN algorithms to easily run
 There are two image types:
 
 - gpu: Contains dockerfile to build images using conda packages for GPU systems.
-- cpu: Contains dockerfile to build images using conda packages for CPU systems. Based on `mambaforge`.
+- cpu: Contains dockerfile to build images using conda packages for CPU systems. Based on `miniforge`.
 
 # Running the Containers
 

cuvs-bench/cpu/Dockerfile

@@ -34,7 +34,7 @@ RUN \
   apt-get install -y --no-install-recommends \
     "${PACKAGES_TO_INSTALL[@]}"
 
-  # install gha-tools for rapids-mamba-retry
+  # install gha-tools for rapids-conda-retry
   /tmp/build-scripts/install-gha-tools
 
   # clean up
@@ -45,14 +45,14 @@ EOF
 # an older conda with newer packages still works well
 # ref: https://github.com/rapidsai/ci-imgs/issues/185
 RUN <<EOF
-rapids-mamba-retry update --all -y -n base
-rapids-mamba-retry install -y -n base "python=${PYTHON_VER}"
-rapids-mamba-retry update --all -y -n base
+rapids-conda-retry update --all -y -n base
+rapids-conda-retry install -y -n base "python=${PYTHON_VER}"
+rapids-conda-retry update --all -y -n base
 PACKAGES_TO_INSTALL=(
   "cuvs-bench-cpu=${RAPIDS_VER}.*"
   "python=${PYTHON_VER}"
 )
-rapids-mamba-retry install -y -n base \
+rapids-conda-retry install -y -n base \
   "${PACKAGES_TO_INSTALL[@]}"
 conda clean -afy
 chmod -R 777 /opt/conda

cuvs-bench/gpu/Dockerfile

@@ -91,12 +91,12 @@ rm -rf /var/lib/apt/lists/*
 /tmp/build-scripts/install-gha-tools
 
 # install cuvs-bench
-rapids-mamba-retry update --all -y -n base
+rapids-conda-retry update --all -y -n base
 PACKAGES_TO_INSTALL=(
     "cuvs-bench=${RAPIDS_VER}.*"
     "cuda-version=${CUDA_VER%.*}.*"
 )
-rapids-mamba-retry install -y -n base \
+rapids-conda-retry install -y -n base \
   "${PACKAGES_TO_INSTALL[@]}"
 conda clean -afy
 chmod -R 777 /opt/conda

tests/container-canary/base.yml

@@ -29,6 +29,14 @@ checks:
           - -c
           # the second component could have a 't' for like '3.15t' for free-threaded builds at some point in the future
           - '[[ "${PYTHON_VERSION}" =~ ^[0-9]{1,2}\.[0-9t]{1,2}$ ]]'
+  - name: tst-conda-active
+    description: test the conda environment is active if running with a login shell
+    probe:
+      exec:
+        command:
+          - /bin/bash
+          - -lc
+          - '[ "${CONDA_EXE+x}" ];'
   - name: tool-conda
     description: conda can be executed
     probe:
@@ -124,3 +132,11 @@ checks:
           - /bin/bash
           - -c
           - "[[ $(conda env list --quiet | grep --count -E '^[A-Za-z]+') == 1 ]];"
+  - name: conda-prefix
+    description: Conda prefix set to /opt/conda
+    probe:
+      exec:
+        command:
+          - /bin/bash
+          - -c
+          - '[[ "${CONDA_PREFIX}" == "/opt/conda" ]];'