From 597f529ef6c80d5ee3bbf040214aea2f23adba40 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 8 Feb 2019 11:24:35 +0100 Subject: [PATCH] pin conda during Python-switch step even with auto-update-conda disabled, switching Python version (which reinstalls conda) can end up upgrading to the latest conda Avoid this by adding the conda pinning to that install stage --- repo2docker/buildpacks/conda/install-miniconda.bash | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/repo2docker/buildpacks/conda/install-miniconda.bash b/repo2docker/buildpacks/conda/install-miniconda.bash index c8b88d6b..55fc1911 100755 --- a/repo2docker/buildpacks/conda/install-miniconda.bash +++ b/repo2docker/buildpacks/conda/install-miniconda.bash @@ -4,7 +4,7 @@ set -ex cd $(dirname $0) MINICONDA_VERSION=4.5.11 -CONDA_VERSION=4.5.11 +CONDA_VERSION=4.5.12 URL="https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" INSTALLER_PATH=/tmp/miniconda-installer.sh @@ -38,7 +38,7 @@ conda install -yq conda==${CONDA_VERSION} # prevent pip installation. # we wouldn't have this issue if we did `conda env create` # instead of `conda env update` in these cases -conda install -y $(cat /tmp/environment.yml | grep -o '\spython=.*') +conda install -y $(cat /tmp/environment.yml | grep -o '\spython=.*') conda==${CONDA_VERSION} # bug in conda 4.3.>15 prevents --set update_dependencies echo 'update_dependencies: false' >> ${CONDA_DIR}/.condarc @@ -70,3 +70,5 @@ conda clean -tipsy rm ${INSTALLER_PATH} chown -R $NB_USER:$NB_USER ${CONDA_DIR} + +conda list