Skip to content

Commit

Permalink
upgrade conda and tini to nerwer versions and stick with pip version …
Browse files Browse the repository at this point in the history
…19.0.1 for now (kubeflow#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
  • Loading branch information
ashahba authored and k8s-ci-robot committed Feb 5, 2019
1 parent d95938f commit 3a29c8b
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
4 changes: 2 additions & 2 deletions components/contrib/kaggle-notebook-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions components/contrib/rapidsai-notebook-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion components/k8s-model-server/images/Dockerfile.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion components/k8s-model-server/images/Dockerfile.gpu
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 8 additions & 5 deletions components/tensorflow-notebook-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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} \
Expand Down
2 changes: 1 addition & 1 deletion components/tensorflow-notebook-image/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 3a29c8b

Please sign in to comment.