Merge pull request #685 from StatCan/Investigate-mamba-fail

Investigate error from mamba
StatCan · Nov 13, 2024 · f488d44 · f488d44
2 parents 80cb2bc + ac8a12b
commit f488d44
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/docker-bits/6_rstudio.Dockerfile b/docker-bits/6_rstudio.Dockerfile
@@ -9,13 +9,19 @@ RUN mkdir -p /etc/rstudio && \
 
 ENV PATH=$PATH:/usr/lib/rstudio-server/bin
 
-# Install some default R packages
 RUN mamba install --quiet --yes \
       'r-rodbc' \
       'r-tidyverse' \
       'r-arrow' \
       'r-aws.s3' \
       'r-catools' \
+      && \
+      clean-layer.sh && \
+      fix-permissions $CONDA_DIR && \
+      fix-permissions /home/$NB_USER
+
+# Install some default R packages
+RUN mamba install --quiet --yes \
       'r-hdf5r' \
       'r-odbc' \
       'r-sf' \

diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile
@@ -195,13 +195,19 @@ RUN mkdir -p /etc/rstudio && \
 
 ENV PATH=$PATH:/usr/lib/rstudio-server/bin
 
-# Install some default R packages
 RUN mamba install --quiet --yes \
       'r-rodbc' \
       'r-tidyverse' \
       'r-arrow' \
       'r-aws.s3' \
       'r-catools' \
+      && \
+      clean-layer.sh && \
+      fix-permissions $CONDA_DIR && \
+      fix-permissions /home/$NB_USER
+
+# Install some default R packages
+RUN mamba install --quiet --yes \
       'r-hdf5r' \
       'r-odbc' \
       'r-sf' \

diff --git a/output/sas/Dockerfile b/output/sas/Dockerfile
@@ -343,13 +343,19 @@ RUN mkdir -p /etc/rstudio && \
 
 ENV PATH=$PATH:/usr/lib/rstudio-server/bin
 
-# Install some default R packages
 RUN mamba install --quiet --yes \
       'r-rodbc' \
       'r-tidyverse' \
       'r-arrow' \
       'r-aws.s3' \
       'r-catools' \
+      && \
+      clean-layer.sh && \
+      fix-permissions $CONDA_DIR && \
+      fix-permissions /home/$NB_USER
+
+# Install some default R packages
+RUN mamba install --quiet --yes \
       'r-hdf5r' \
       'r-odbc' \
       'r-sf' \