From 3879447743394032865c45b4ce58183c8a54a874 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Mon, 30 Sep 2024 20:25:16 -0700
Subject: [PATCH] try creating a new conda environment

---
 .github/workflows/test-notebooks.yml | 8 +++++---
 Dockerfile                           | 6 +++---
 context/entrypoint.sh                | 6 ++++--
 dockerhub-readme.md                  | 2 +-
 raft-ann-bench/README.md             | 2 +-
 raft-ann-bench/cpu/Dockerfile        | 7 ++-----
 raft-ann-bench/gpu/Dockerfile        | 5 ++---
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/test-notebooks.yml b/.github/workflows/test-notebooks.yml
index 9e0cff24..764e0be1 100644
--- a/.github/workflows/test-notebooks.yml
+++ b/.github/workflows/test-notebooks.yml
@@ -67,7 +67,7 @@ jobs:
     steps:
       - name: Install required tools
         run: |
-          mamba install -n base --freeze-installed \
+          mamba install -n rapids --freeze-installed \
             curl \
             git
       - name: Install gha-tools
@@ -88,12 +88,14 @@ jobs:
           rapids-logger "nvidia-smi"
           nvidia-smi
       - name: Test notebooks
-        run: /home/rapids/test_notebooks.py -i /home/rapids/notebooks -o /home/rapids/notebooks_output
+        run: |
+          . /opt/conda/etc/profile.d/conda.sh; conda activate rapids
+          /home/rapids/test_notebooks.py -i /home/rapids/notebooks -o /home/rapids/notebooks_output
       - name: Install awscli
         if: '!cancelled()'
         run: |
           PATH="$PATH:$GHA_TOOLS_DIR"
-          rapids-mamba-retry install -n base awscli
+          rapids-mamba-retry install -n rapids awscli
       - uses: aws-actions/configure-aws-credentials@v4
         if: '!cancelled()'
         with:
diff --git a/Dockerfile b/Dockerfile
index 2c8beb83..f3b4a3a7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,7 +57,7 @@ conda config --show-sources
 conda list --show-channel-urls
 
 # Install RAPIDS
-mamba install -y -n base \
+mamba env create -y -n rapids \
     "rapids=${RAPIDS_VER}.*" \
     "python=${PYTHON_VER}.*" \
     "cuda-version=${CUDA_VER%.*}.*" \
@@ -90,12 +90,12 @@ COPY --from=dependencies --chown=rapids /test_notebooks_dependencies.yaml test_n
 COPY --from=dependencies --chown=rapids /notebooks /home/rapids/notebooks
 
 RUN <<EOF
-mamba env update -n base -f test_notebooks_dependencies.yaml
+mamba env update -n rapids -f test_notebooks_dependencies.yaml
 conda clean -afy
 EOF
 
 RUN <<EOF
-mamba install -y -n base \
+mamba install -y -n rapids \
     "jupyterlab=4" \
     dask-labextension \
     jupyterlab-nvdashboard
diff --git a/context/entrypoint.sh b/context/entrypoint.sh
index 82b9c8cf..ffa48613 100755
--- a/context/entrypoint.sh
+++ b/context/entrypoint.sh
@@ -10,12 +10,12 @@ EOF
 
 if [ -e "/home/rapids/environment.yml" ]; then
     echo "environment.yml found. Installing packages."
-    timeout ${CONDA_TIMEOUT:-600} mamba env update -n base -f /home/rapids/environment.yml || exit $?
+    timeout ${CONDA_TIMEOUT:-600} mamba env update -n rapids -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} mamba install -n rapids -y $EXTRA_CONDA_PACKAGES || exit $?
 fi
 
 if [ "$EXTRA_PIP_PACKAGES" ]; then
@@ -23,6 +23,8 @@ if [ "$EXTRA_PIP_PACKAGES" ]; then
     timeout ${PIP_TIMEOUT:-600} pip install $EXTRA_PIP_PACKAGES || exit $?
 fi
 
+. /opt/conda/etc/profile.d/conda.sh; conda activate rapids
+
 # Run whatever the user wants.
 if [ "${UNQUOTE}" = "true" ]; then
     exec $@
diff --git a/dockerhub-readme.md b/dockerhub-readme.md
index 72b60707..6fabb1ac 100644
--- a/dockerhub-readme.md
+++ b/dockerhub-readme.md
@@ -115,7 +115,7 @@ The `rapidsai/notebooks` container has notebooks for the RAPIDS libraries in `/h
 
 ### Extending RAPIDS Images
 
-All RAPIDS images use `conda` as their package manager, and all RAPIDS packages are available in the `base` conda environment. These image run as the `rapids` user.
+All RAPIDS images use `conda` as their package manager, and all RAPIDS packages are available in the `rapids` conda environment. These image run as the `rapids` user.
 
 ### Access Documentation within Notebooks
 
diff --git a/raft-ann-bench/README.md b/raft-ann-bench/README.md
index b7eba341..e04def1f 100644
--- a/raft-ann-bench/README.md
+++ b/raft-ann-bench/README.md
@@ -84,7 +84,7 @@ docker run --gpus all --rm -it \
 This will drop you into a command line in the container, with RAFT and the `raft_ann_benchmarks` python package ready to use:
 
 ```
-(base) root@00b068fbb862:/home/rapids#
+(rapids) root@00b068fbb862:/home/rapids#
 ```
 
 Additionally, the containers could be run in dettached form without any issue.
diff --git a/raft-ann-bench/cpu/Dockerfile b/raft-ann-bench/cpu/Dockerfile
index 5f383aaf..fa1d8723 100644
--- a/raft-ann-bench/cpu/Dockerfile
+++ b/raft-ann-bench/cpu/Dockerfile
@@ -17,7 +17,7 @@ SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 RUN <<EOF
 mkdir /data
 chmod 777 /data
-echo ". /opt/conda/etc/profile.d/conda.sh; conda activate base" >> /etc/bash.bashrc
+echo ". /opt/conda/etc/profile.d/conda.sh; conda activate rapids" >> /etc/bash.bashrc
 EOF
 
 # we need perl temporarily for the remaining benchmark perl scripts
@@ -27,10 +27,7 @@ RUN apt-get install perl -y
 # an older conda with newer packages still works well
 # ref: https://github.com/rapidsai/ci-imgs/issues/185
 RUN <<EOF
-mamba update --all -y -n base
-mamba install -y -n base "python=${PYTHON_VER}"
-mamba update --all -y -n base
-mamba install -y -n base \
+mamba env create -y -n rapids \
   "raft-ann-bench-cpu=${RAPIDS_VER}.*" \
   "python=${PYTHON_VER}"
 conda clean -afy
diff --git a/raft-ann-bench/gpu/Dockerfile b/raft-ann-bench/gpu/Dockerfile
index 54de8c73..1e2a7c9b 100644
--- a/raft-ann-bench/gpu/Dockerfile
+++ b/raft-ann-bench/gpu/Dockerfile
@@ -20,15 +20,14 @@ SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 RUN <<EOF
 mkdir /data
 chmod 777 /data
-echo ". /opt/conda/etc/profile.d/conda.sh; conda activate base" >> /etc/bash.bashrc
+echo ". /opt/conda/etc/profile.d/conda.sh; conda activate rapids" >> /etc/bash.bashrc
 EOF
 
 # we need perl temporarily for the remaining benchmark perl scripts
 RUN apt-get install perl -y
 
 RUN <<EOF
-mamba update --all -y -n base
-mamba install -y -n base \
+mamba env create -y -n rapids \
     "raft-ann-bench=${RAPIDS_VER}.*" \
     "cuda-version=${CUDA_VER%.*}.*"
 conda clean -afy