From 9916e6215de7be014f5ee4029ee62291c248f35e Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Thu, 28 Sep 2023 16:52:38 -0500 Subject: [PATCH] FIX small fixes for cpu dockerfile and better comments --- raft-ann-bench/cpu/Dockerfile | 3 +++ raft-ann-bench/gpu/Dockerfile | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/raft-ann-bench/cpu/Dockerfile b/raft-ann-bench/cpu/Dockerfile index 8e889246..4c9849be 100644 --- a/raft-ann-bench/cpu/Dockerfile +++ b/raft-ann-bench/cpu/Dockerfile @@ -17,6 +17,9 @@ RUN chmod g+ws /opt/conda # Reassign root's primary group to root RUN usermod -g root root +# 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 RUN useradd -rm -d /home/rapids -s /bin/bash -g conda -u 1001 rapids USER rapids diff --git a/raft-ann-bench/gpu/Dockerfile b/raft-ann-bench/gpu/Dockerfile index 2d70599c..24c48912 100644 --- a/raft-ann-bench/gpu/Dockerfile +++ b/raft-ann-bench/gpu/Dockerfile @@ -10,6 +10,8 @@ FROM rapidsai/mambaforge-cuda:cuda${CUDA_VER}-base-${LINUX_VER}-py${PYTHON_VER} ARG CUDA_VER ARG RAPIDS_VER +# 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 RUN useradd -rm -d /home/rapids -s /bin/bash -g conda -u 1001 rapids # rapids is the default user, but users can use the -u docker run flag to write/read to mounted volumes. @@ -26,9 +28,12 @@ RUN mamba update --all -y -n base \ "rmm=${RAPIDS_VER}.*" \ && conda clean -afy -# we need to change the permissions of the conda folder so that all users can execute +# Change the permissions of the conda folder so that all users can execute, +# particularly the user passed by -u $(id -u) USER root RUN chmod -R 777 /opt/conda + +# switch back to rapids user by default USER rapids COPY raft-ann-bench/run_benchmark.sh /data/scripts/run_benchmark.sh