Skip to content

Commit 1e37452

Browse files
authored
Merge pull request #895 from jamesdbrock/conda-pin-version
Pin conda version to $CONDA_VERSION
2 parents d4cbf2f + 2743b35 commit 1e37452

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

base-notebook/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,18 @@ RUN mkdir /home/$NB_USER/work && \
6767

6868
# Install conda as jovyan and check the md5 sum provided on the download site
6969
ENV MINICONDA_VERSION=4.5.12 \
70-
CONDA_VERSION=4.6.7
70+
CONDA_VERSION=4.6.14
7171

7272
RUN cd /tmp && \
7373
wget --quiet https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \
7474
echo "866ae9dff53ad0874e1d1a60b1ad1ef8 *Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" | md5sum -c - && \
7575
/bin/bash Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -f -b -p $CONDA_DIR && \
7676
rm Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \
77+
echo "conda ${CONDA_VERSION}" >> $CONDA_DIR/conda-meta/pinned && \
7778
$CONDA_DIR/bin/conda config --system --prepend channels conda-forge && \
7879
$CONDA_DIR/bin/conda config --system --set auto_update_conda false && \
7980
$CONDA_DIR/bin/conda config --system --set show_channel_urls true && \
80-
$CONDA_DIR/bin/conda install --quiet --yes conda="${CONDA_VERSION%.*}.*" && \
81+
$CONDA_DIR/bin/conda install --quiet --yes conda && \
8182
$CONDA_DIR/bin/conda update --all --quiet --yes && \
8283
conda list python | grep '^python ' | tr -s ' ' | cut -d '.' -f 1,2 | sed 's/$/.*/' >> $CONDA_DIR/conda-meta/pinned && \
8384
conda clean --all -f -y && \

0 commit comments

Comments
 (0)