From 240efebcf2acd7d307e19fea3fdfbfb3ff9b7716 Mon Sep 17 00:00:00 2001
From: Tim Head <betatim@gmail.com>
Date: Sat, 4 May 2019 12:32:26 +0200
Subject: [PATCH 1/3] Remove the conda package cache as we can't hardlink to it

---
 repo2docker/buildpacks/conda/install-miniconda.bash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/repo2docker/buildpacks/conda/install-miniconda.bash b/repo2docker/buildpacks/conda/install-miniconda.bash
index fcbabace8..aed62ecf8 100755
--- a/repo2docker/buildpacks/conda/install-miniconda.bash
+++ b/repo2docker/buildpacks/conda/install-miniconda.bash
@@ -69,6 +69,7 @@ fi
 
 # Clean things out!
 conda clean -tipsy
+rm -rf /srv/conda/pkgs
 
 # Remove the big installer so we don't increase docker image size too much
 rm ${INSTALLER_PATH}

From 3a6e4b48513134984690c86ac59d2255bc94d7b0 Mon Sep 17 00:00:00 2001
From: Tim Head <betatim@gmail.com>
Date: Sat, 4 May 2019 13:03:50 +0200
Subject: [PATCH 2/3] Remove pip cache in root's home directory

---
 repo2docker/buildpacks/conda/install-miniconda.bash | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/repo2docker/buildpacks/conda/install-miniconda.bash b/repo2docker/buildpacks/conda/install-miniconda.bash
index aed62ecf8..eeae52d7e 100755
--- a/repo2docker/buildpacks/conda/install-miniconda.bash
+++ b/repo2docker/buildpacks/conda/install-miniconda.bash
@@ -73,6 +73,8 @@ rm -rf /srv/conda/pkgs
 
 # Remove the big installer so we don't increase docker image size too much
 rm ${INSTALLER_PATH}
+# Remove pip cache created as part of installing miniconda
+rm -rf /root/.cache
 
 chown -R $NB_USER:$NB_USER ${CONDA_DIR}
 

From f51ba7604eda85dcae269d26e9324d457fb767d7 Mon Sep 17 00:00:00 2001
From: Tim Head <betatim@gmail.com>
Date: Sun, 5 May 2019 14:55:58 +0200
Subject: [PATCH 3/3] Use `-f --all` for conda clean up

---
 repo2docker/buildpacks/conda/__init__.py            | 5 ++---
 repo2docker/buildpacks/conda/install-miniconda.bash | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/repo2docker/buildpacks/conda/__init__.py b/repo2docker/buildpacks/conda/__init__.py
index 9dec3e993..e0a36cfe9 100644
--- a/repo2docker/buildpacks/conda/__init__.py
+++ b/repo2docker/buildpacks/conda/__init__.py
@@ -182,9 +182,8 @@ def get_assemble_scripts(self):
                 '${NB_USER}',
                 r"""
                 conda env update -p {0} -f "{1}" && \
-                conda clean -tipsy && \
-                conda list -p {0} && \
-                rm -rf /srv/conda/pkgs
+                conda clean --all -f -y && \
+                conda list -p {0}
                 """.format(env_prefix, environment_yml)
             ))
         return super().get_assemble_scripts() + assembly_scripts
diff --git a/repo2docker/buildpacks/conda/install-miniconda.bash b/repo2docker/buildpacks/conda/install-miniconda.bash
index eeae52d7e..5ee2239d4 100755
--- a/repo2docker/buildpacks/conda/install-miniconda.bash
+++ b/repo2docker/buildpacks/conda/install-miniconda.bash
@@ -68,12 +68,12 @@ if [[ -f /tmp/kernel-environment.yml ]]; then
 fi
 
 # Clean things out!
-conda clean -tipsy
-rm -rf /srv/conda/pkgs
+conda clean --all -f -y
 
 # Remove the big installer so we don't increase docker image size too much
 rm ${INSTALLER_PATH}
-# Remove pip cache created as part of installing miniconda
+
+# Remove the pip cache created as part of installing miniconda
 rm -rf /root/.cache
 
 chown -R $NB_USER:$NB_USER ${CONDA_DIR}