Merge branch '2312-docker-condaprefix' of github.com:dantegd/rapids-d…

…ocker into 2312-docker-condaprefix
rapidsai · Oct 18, 2023 · 2d08100 · 2d08100
2 parents 538e83d + e3940a7
commit 2d08100
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/raft-ann-bench/cpu/Dockerfile b/raft-ann-bench/cpu/Dockerfile
@@ -13,7 +13,8 @@ COPY condarc /opt/conda/.condarc
 # when the user passes their uid to docker run with -u $(id -u)
 # Also add the conda_prefix config to the global bashrc file so that all users have it correctly configured.
 RUN mkdir /data && chmod 777 /data \
-    &&  echo "export CONDA_PREFIX=/opt/conda" >> /etc/bash.bashrc
+    &&  ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh; \
+    echo ". /opt/conda/etc/profile.d/conda.sh; conda activate base" >> /etc/bash.bashrc
 
 # Install python before updating environment, otherwise Python 3.9 image
 # runs into a solver conflict with truststore 0.8.0. This avoids the environment installing

diff --git a/raft-ann-bench/gpu/Dockerfile b/raft-ann-bench/gpu/Dockerfile
@@ -14,9 +14,11 @@ COPY condarc /opt/conda/.condarc
 
 # Create a data folder accessible by any user so mounted volumes under it can be accessible
 # when the user passes their uid to docker run with -u $(id -u)
+
 # Also add the conda_prefix config to the global bashrc file so that all users have it correctly configured.
 RUN mkdir /data && chmod 777 /data \
-    &&  echo "export CONDA_PREFIX=/opt/conda" >> /etc/bash.bashrc
+      && ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh; \
+      echo ". /opt/conda/etc/profile.d/conda.sh; conda activate base" >> /etc/bash.bashrc
 
 # temporarily downgrade conda from 23.9.0 due to https://github.com/mamba-org/mamba/issues/2882
 # after the mamba update step