Fix output folder

StatCan · Nov 13, 2024 · ac8a12b · ac8a12b
1 parent 221278d
commit ac8a12b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/output/jupyterlab-cpu/Dockerfile b/output/jupyterlab-cpu/Dockerfile
@@ -29,8 +29,6 @@ RUN apt-get update --yes \
     && rm -rf /var/lib/apt/lists/* \
     && chmod +x /usr/bin/clean-layer.sh
 
-RUN conda install mamba=2.0.0
-
 ###############################
 ###  docker-bits/3_Kubeflow.Dockerfile
 ###############################

diff --git a/output/jupyterlab-pytorch/Dockerfile b/output/jupyterlab-pytorch/Dockerfile
@@ -29,8 +29,6 @@ RUN apt-get update --yes \
     && rm -rf /var/lib/apt/lists/* \
     && chmod +x /usr/bin/clean-layer.sh
 
-RUN conda install mamba=2.0.0
-
 ###############################
 ###  docker-bits/2_pytorch.Dockerfile
 ###############################

diff --git a/output/jupyterlab-tensorflow/Dockerfile b/output/jupyterlab-tensorflow/Dockerfile
@@ -29,8 +29,6 @@ RUN apt-get update --yes \
     && rm -rf /var/lib/apt/lists/* \
     && chmod +x /usr/bin/clean-layer.sh
 
-RUN conda install mamba=2.0.0
-
 ###############################
 ###  docker-bits/1_CUDA-11.8.0.Dockerfile
 ###############################

diff --git a/output/rstudio/Dockerfile b/output/rstudio/Dockerfile
@@ -29,8 +29,6 @@ RUN apt-get update --yes \
     && rm -rf /var/lib/apt/lists/* \
     && chmod +x /usr/bin/clean-layer.sh
 
-RUN conda install mamba=2.0.0
-
 ###############################
 ###  docker-bits/3_Kubeflow.Dockerfile
 ###############################
@@ -203,6 +201,13 @@ RUN mamba install --quiet --yes \
       '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
@@ -30,8 +30,6 @@ RUN pip install --force-reinstall cryptography==39.0.1 && \
    fix-permissions $CONDA_DIR && \
    fix-permissions /home/$NB_USER
 
-RUN conda install mamba=2.0.0
-
 ###############################
 ###  docker-bits/3_Kubeflow.Dockerfile
 ###############################
@@ -351,6 +349,13 @@ RUN mamba install --quiet --yes \
       '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' \