From ae0d3c79404df54757952c748bbccf6e5098cef2 Mon Sep 17 00:00:00 2001
From: Jonathan Felder <felder@berkeley.edu>
Date: Thu, 10 Oct 2024 11:10:30 -0700
Subject: [PATCH] [DH-394] just a couple of minor tweaks

---
 Dockerfile              | 8 ++++++--
 install-mambaforge.bash | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c18dc70..44db757 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,8 +54,8 @@ RUN apt-get update > /dev/null && \
 COPY install-mambaforge.bash /tmp/install-mambaforge.bash
 RUN /tmp/install-mambaforge.bash
 
-RUN chown -Rh rstudio:rstudio /home/rstudio
-RUN chown -Rh rstudio:rstudio /srv/conda
+# needed for building on mac see DH-394
+RUN chown -Rh ${NB_USER}:${NB_USER} ${HOME}
 
 USER ${NB_USER}
 
@@ -92,4 +92,8 @@ RUN r /tmp/r-packages/2021-spring-phw-272a.r
 # Use simpler locking strategy
 COPY file-locks /etc/rstudio/file-locks
 
+# Doing a little cleanup
+RUN rm -rf /tmp/downloaded_packages
+RUN rm -rf ${HOME}/.cache
+
 ENTRYPOINT ["tini", "--"]
diff --git a/install-mambaforge.bash b/install-mambaforge.bash
index c27ba02..42e86ae 100755
--- a/install-mambaforge.bash
+++ b/install-mambaforge.bash
@@ -37,6 +37,6 @@ rm ${INSTALLER_PATH}
 # Remove the pip cache created as part of installing mambaforge
 rm -rf /root/.cache
 
-chown -R $NB_USER:$NB_USER ${CONDA_DIR}
+chown -Rh $NB_USER:$NB_USER ${CONDA_DIR}
 
 conda list -n root