From 2ae1dde0126de722f76d2fd51959f9300d071bda Mon Sep 17 00:00:00 2001 From: Tim Head Date: Fri, 21 Jun 2019 21:48:02 +0200 Subject: [PATCH] Switch to using -L for `find` instead of -follow --- repo2docker/buildpacks/conda/__init__.py | 6 +++--- repo2docker/buildpacks/conda/install-miniconda.bash | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repo2docker/buildpacks/conda/__init__.py b/repo2docker/buildpacks/conda/__init__.py index 78cda33d..e6212d0e 100644 --- a/repo2docker/buildpacks/conda/__init__.py +++ b/repo2docker/buildpacks/conda/__init__.py @@ -191,9 +191,9 @@ class CondaBuildPack(BaseImage): r""" conda env update -p {0} -f "{1}" && \ conda clean --all -f -y && \ - find ${{CONDA_DIR}} -follow -type f -name '*.a' -delete && \ - find ${{CONDA_DIR}} -follow -type f -name '*.pyc' -delete && \ - find ${{CONDA_DIR}} -follow -type f -name '*.js.map' -delete && \ + find -L ${{CONDA_DIR}} -type f -name '*.a' -delete && \ + find -L ${{CONDA_DIR}} -type f -name '*.pyc' -delete && \ + find -L ${{CONDA_DIR}} -type f -name '*.js.map' -delete && \ conda list -p {0} """.format( env_prefix, environment_yml diff --git a/repo2docker/buildpacks/conda/install-miniconda.bash b/repo2docker/buildpacks/conda/install-miniconda.bash index 09a36754..f1567cd0 100755 --- a/repo2docker/buildpacks/conda/install-miniconda.bash +++ b/repo2docker/buildpacks/conda/install-miniconda.bash @@ -71,9 +71,9 @@ fi conda clean --all -f -y # Remove static libaries, compiled Python byte code, JS map files -find ${CONDA_DIR} -follow -type f -name '*.a' -delete -find ${CONDA_DIR} -follow -type f -name '*.pyc' -delete -find ${CONDA_DIR} -follow -type f -name '*.js.map' -delete +find -L ${CONDA_DIR} -type f -name '*.a' -delete +find -L ${CONDA_DIR} -type f -name '*.pyc' -delete +find -L ${CONDA_DIR} -type f -name '*.js.map' -delete # Remove the big installer so we don't increase docker image size too much rm ${INSTALLER_PATH}