From fc6022aa6112b8a39169851e041dad81c4b60716 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 23 Jan 2020 10:04:18 +0100 Subject: [PATCH 1/2] install pip explicitly it should be there automatically, but no harm in being explicit --- base-notebook/Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 86092e35e1..4c4bc4a192 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -80,13 +80,14 @@ RUN cd /tmp && \ /bin/bash Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ rm Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \ echo "conda ${CONDA_VERSION}" >> $CONDA_DIR/conda-meta/pinned && \ - $CONDA_DIR/bin/conda config --system --prepend channels conda-forge && \ - $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ - $CONDA_DIR/bin/conda config --system --set show_channel_urls true && \ + conda config --system --prepend channels conda-forge && \ + conda config --system --set auto_update_conda false && \ + conda config --system --set show_channel_urls true && \ if [ ! $PYTHON_VERSION = 'default' ]; then conda install --yes python=$PYTHON_VERSION; fi && \ conda list python | grep '^python ' | tr -s ' ' | cut -d '.' -f 1,2 | sed 's/$/.*/' >> $CONDA_DIR/conda-meta/pinned && \ - $CONDA_DIR/bin/conda install --quiet --yes conda && \ - $CONDA_DIR/bin/conda update --all --quiet --yes && \ + conda install --quiet --yes conda && \ + conda install --quiet --yes pip && \ + conda update --all --quiet --yes && \ conda clean --all -f -y && \ rm -rf /home/$NB_USER/.cache/yarn && \ fix-permissions $CONDA_DIR && \ @@ -106,7 +107,7 @@ RUN conda install --quiet --yes 'tini=0.18.0' && \ # Do all this in a single RUN command to avoid duplicating all of the # files across image layers when the permissions change RUN conda install --quiet --yes \ - 'notebook=6.0.2' \ + 'notebook=6.0.3' \ 'jupyterhub=1.1.0' \ 'jupyterlab=1.2.5' && \ conda clean --all -f -y && \ From 9c8ac723233f59b02c111f205e1af0d16850e5e8 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 23 Jan 2020 16:40:48 +0100 Subject: [PATCH 2/2] update miniconda to 4.7.12.1 --- base-notebook/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 4c4bc4a192..277f638a28 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -70,8 +70,8 @@ RUN mkdir /home/$NB_USER/work && \ fix-permissions /home/$NB_USER # Install conda as jovyan and check the md5 sum provided on the download site -ENV MINICONDA_VERSION=4.7.10 \ - MINICONDA_MD5=1c945f2b3335c7b2b15130b1b2dc5cf4 \ +ENV MINICONDA_VERSION=4.7.12.1 \ + MINICONDA_MD5=81c773ff87af5cfac79ab862942ab6b3 \ CONDA_VERSION=4.7.12 RUN cd /tmp && \