From 3a29c8b0f976c9ba606a1dee3fb99fb0b81fb08c Mon Sep 17 00:00:00 2001 From: Abolfazl Shahbazi Date: Mon, 4 Feb 2019 19:27:31 -0800 Subject: [PATCH] upgrade conda and tini to nerwer versions and stick with pip version 19.0.1 for now (#2372) * upgrade conda to 4.5.12 and stick with pip version 19.0.1 for now * Fix the sha256sum for Miniconda v4.5.12 and upgrade tini to v0.18.0 across the board * Use sha256sum for Miniconda3 version * Cap conda version to v4.5.4 until TensorFlow start supportting Python 3.7 * Fix the Miniconda3 sha5sum --- components/contrib/kaggle-notebook-image/Dockerfile | 4 ++-- .../contrib/rapidsai-notebook-image/Dockerfile | 6 +++--- components/k8s-model-server/images/Dockerfile.cpu | 2 +- components/k8s-model-server/images/Dockerfile.gpu | 2 +- components/tensorflow-notebook-image/Dockerfile | 13 ++++++++----- components/tensorflow-notebook-image/install.sh | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/components/contrib/kaggle-notebook-image/Dockerfile b/components/contrib/kaggle-notebook-image/Dockerfile index 6e4b98c9a76..44dc73c5076 100644 --- a/components/contrib/kaggle-notebook-image/Dockerfile +++ b/components/contrib/kaggle-notebook-image/Dockerfile @@ -49,8 +49,8 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ # Install Tini - used as entrypoint for container RUN cd /tmp && \ - wget --quiet https://github.com/krallin/tini/releases/download/v0.10.0/tini && \ - echo "1361527f39190a7338a0b434bd8c88ff7233ce7b9a4876f3315c22fce7eca1b0 *tini" | sha256sum -c - && \ + wget --quiet https://github.com/krallin/tini/releases/download/v0.18.0/tini && \ + echo "12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855 *tini" | sha256sum -c - && \ mv tini /usr/local/bin/tini && \ chmod +x /usr/local/bin/tini diff --git a/components/contrib/rapidsai-notebook-image/Dockerfile b/components/contrib/rapidsai-notebook-image/Dockerfile index adf60c76818..77cefd76d37 100644 --- a/components/contrib/rapidsai-notebook-image/Dockerfile +++ b/components/contrib/rapidsai-notebook-image/Dockerfile @@ -46,13 +46,13 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ apt-get install -y google-cloud-sdk kubectl && \ # Install to the existing RapidsAI conda env source activate rapids && \ - pip install --upgrade pip && \ + pip install --upgrade pip==19.0.1 && \ pip --no-cache-dir install jupyterhub matplotlib # Install Tini - used as entrypoint for container RUN cd /tmp && \ - wget --quiet https://github.com/krallin/tini/releases/download/v0.10.0/tini && \ - echo "1361527f39190a7338a0b434bd8c88ff7233ce7b9a4876f3315c22fce7eca1b0 *tini" | sha256sum -c - && \ + wget --quiet https://github.com/krallin/tini/releases/download/v0.18.0/tini && \ + echo "12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855 *tini" | sha256sum -c - && \ mv tini /usr/local/bin/tini && \ chmod +x /usr/local/bin/tini diff --git a/components/k8s-model-server/images/Dockerfile.cpu b/components/k8s-model-server/images/Dockerfile.cpu index d7c5f7ed480..d4192529a03 100644 --- a/components/k8s-model-server/images/Dockerfile.cpu +++ b/components/k8s-model-server/images/Dockerfile.cpu @@ -51,7 +51,7 @@ RUN set -x \ && [ `id -u $MS_USER` -eq 1000 ] \ && [ `id -g $MS_USER` -eq 1000 ] -ENV TINI_VERSION v0.17.0 +ENV TINI_VERSION v0.18.0 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini diff --git a/components/k8s-model-server/images/Dockerfile.gpu b/components/k8s-model-server/images/Dockerfile.gpu index 416632fcdf9..0a2260b137f 100644 --- a/components/k8s-model-server/images/Dockerfile.gpu +++ b/components/k8s-model-server/images/Dockerfile.gpu @@ -114,7 +114,7 @@ RUN set -x \ && [ `id -u $MS_USER` -eq 1000 ] \ && [ `id -g $MS_USER` -eq 1000 ] -ENV TINI_VERSION v0.17.0 +ENV TINI_VERSION v0.18.0 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini diff --git a/components/tensorflow-notebook-image/Dockerfile b/components/tensorflow-notebook-image/Dockerfile index 2c5fc19cb49..0d9cdb55f78 100644 --- a/components/tensorflow-notebook-image/Dockerfile +++ b/components/tensorflow-notebook-image/Dockerfile @@ -86,17 +86,20 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ # Install Tini - used as entrypoint for container RUN cd /tmp && \ - wget --quiet https://github.com/krallin/tini/releases/download/v0.10.0/tini && \ - echo "1361527f39190a7338a0b434bd8c88ff7233ce7b9a4876f3315c22fce7eca1b0 *tini" | sha256sum -c - && \ + wget --quiet https://github.com/krallin/tini/releases/download/v0.18.0/tini && \ + echo "12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855 *tini" | sha256sum -c - && \ mv tini /usr/local/bin/tini && \ chmod +x /usr/local/bin/tini # Install conda as jovyan user and check the md5 sum provided on the download site -ENV MINICONDA_VERSION 4.4.10 +# After Miniconda v4.5.4 the default Python version is no longer 3.6, but TensorFlow +# still doesn't support Python 3.7. If we still like to upgrade Miniconda we need +# to add the line "conda install python==3.6" to RUN command below +ENV MINICONDA_VERSION 4.5.4 RUN cd /tmp && \ mkdir -p $CONDA_DIR && \ wget --quiet https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \ - echo "bec6203dbb2f53011e974e9bf4d46e93 *Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" | md5sum -c - && \ + echo "a946ea1d0c4a642ddf0c3a26a18bb16d *Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh" | md5sum -c - && \ /bin/bash Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh -f -b -p ${CONDA_DIR} && \ rm Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh && \ conda config --system --prepend channels conda-forge && \ @@ -111,7 +114,7 @@ RUN cd /tmp && \ # The image size can grow significantly. # Install base python3 packages -RUN pip install --upgrade pip && \ +RUN pip install --upgrade pip==19.0.1 && \ pip --no-cache-dir install \ # Tensorflow ${TF_PACKAGE} \ diff --git a/components/tensorflow-notebook-image/install.sh b/components/tensorflow-notebook-image/install.sh index cb81f2c7f67..a0de52044d0 100755 --- a/components/tensorflow-notebook-image/install.sh +++ b/components/tensorflow-notebook-image/install.sh @@ -5,7 +5,7 @@ set -ex conda create -n py2 python=2 source activate py2 -pip install --upgrade pip +pip install --upgrade pip==19.0.1 # TFX packages only supports python 2 pip --no-cache-dir install \