FIX conda prefix for all users

rapidsai · Oct 16, 2023 · b19c3c1 · b19c3c1
1 parent f079e00
commit b19c3c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/raft-ann-bench/cpu/Dockerfile b/raft-ann-bench/cpu/Dockerfile
@@ -11,7 +11,9 @@ 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)
-RUN mkdir /data && chmod 777 /data
+# 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
 
 # temporarily downgrade conda from 23.9.0 due to https://github.com/mamba-org/mamba/issues/2882
 # after the mamba update step
@@ -25,7 +27,7 @@ RUN mamba update --all -y -n base \
 
 RUN useradd -rm -d /home/rapids -s /bin/bash -u 1001 rapids
 USER rapids
-WORKDIR /home/rapids
+WORKDIR /data/benchmarks
 
 COPY raft-ann-bench/run_benchmark.sh /data/scripts/run_benchmark.sh
 

diff --git a/raft-ann-bench/gpu/Dockerfile b/raft-ann-bench/gpu/Dockerfile
@@ -14,7 +14,9 @@ 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)
-RUN mkdir /data && chmod 777 /data
+# 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
 
 # temporarily downgrade conda from 23.9.0 due to https://github.com/mamba-org/mamba/issues/2882
 # after the mamba update step
@@ -31,7 +33,7 @@ RUN mamba update --all -y -n base \
 # but users are encouraged to  use the -u docker run flag to write/read to mounted volumes.
 RUN useradd -rm -d /home/rapids -s /bin/bash -g conda -u 1001 rapids
 USER rapids
-WORKDIR /home/rapids
+WORKDIR /data/benchmarks
 
 COPY raft-ann-bench/run_benchmark.sh /data/scripts/run_benchmark.sh