From 52218ef9996fca8226adca0a3f870242e548858a Mon Sep 17 00:00:00 2001 From: Vishnu Mohan Date: Tue, 7 Aug 2018 09:49:14 -0400 Subject: [PATCH] Bump to Debian 9.5 and pin major packages to channels and versions to improve build reproducability --- Dockerfile | 13 +++++++----- jupyter-root-conda-base-env.yml | 36 ++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4680a7f..f0a21ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -# debian:9.4 - linux; amd64 -# https://github.com/docker-library/repo-info/blob/master/repos/debian/tag-details.md#debian94---linux-amd64 -FROM debian@sha256:316ebb92ca66bb8ddc79249fb29872bece4be384cb61b5344fac4e84ca4ed2b2 +# debian:9.5 - linux; amd64 +# https://github.com/docker-library/repo-info/blob/master/repos/debian/tag-details.md#debian95---linux-amd64 +FROM debian@sha256:f1f61086ea01a72b30c7287adee8c929e569853de03b7c462a8ac75e0d0224c4 -ARG JUPYTER_DCOS_VERSION="1.1.0-0.33.4" +ARG JUPYTER_DCOS_VERSION="1.2.0-0.33.7" ARG BUILD_DATE ARG CODENAME="stretch" ARG CONDA_DIR="/opt/conda" @@ -240,12 +240,15 @@ RUN cd /tmp \ && bash "./${CONDA_INSTALLER}" -u -b -p "${CONDA_DIR}" \ && ${CONDA_DIR}/bin/conda update --json --all -yq \ && ${CONDA_DIR}/bin/pip install --upgrade pip \ + && ${CONDA_DIR}/bin/conda config --env --add pinned_packages defaults::numpy-base \ + && ${CONDA_DIR}/bin/conda config --env --add pinned_packages defaults::numpy \ + && ${CONDA_DIR}/bin/conda config --env --add pinned_packages defaults::scipy \ && ${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_DIR}/bin/conda env update --json -q -f "${CONDA_DIR}/${CONDA_ENV_YML}" \ && ${CONDA_DIR}/bin/jupyter toree install --sys-prefix --interpreters=Scala,PySpark,SparkR,SQL \ - && ${CONDA_DIR}/bin/jupyter labextension install @jupyter-widgets/jupyterlab-manager@0.36.0 \ + && ${CONDA_DIR}/bin/jupyter labextension install @jupyter-widgets/jupyterlab-manager@0.36.1 \ && ${CONDA_DIR}/bin/jupyter labextension install @jupyterlab/fasta-extension \ && ${CONDA_DIR}/bin/jupyter labextension install @jupyterlab/geojson-extension \ && ${CONDA_DIR}/bin/jupyter labextension install @jupyterlab/github \ diff --git a/jupyter-root-conda-base-env.yml b/jupyter-root-conda-base-env.yml index f71678c..294a1a5 100644 --- a/jupyter-root-conda-base-env.yml +++ b/jupyter-root-conda-base-env.yml @@ -4,6 +4,7 @@ channels: - defaults dependencies: - altair +- astunparse - atomicwrites - attrs - awscli @@ -12,36 +13,46 @@ dependencies: - beautifulsoup4 - bokeh - click +- colour - cython -- dask +- dask=0.18.2 - dask-ml - dask-tensorflow - dask-xgboost -- distributed +- distributed=1.22.1 - flake8 +- flask - funcsigs - future +- geojson +- gitdb2 +- gitpython +- gunicorn - grpcio - h5py -- ipywidgets - invoke +- ipywidgets=7.4.0 +- itsdangerous - jupyter_contrib_nbextensions -- jupyterhub -- jupyterlab=0.33.4 +- jupyterlab=0.33.7 - keras - libhdfs3 - lxml +- lz4 - matplotlib - more-itertools - mpi[openmpi] - mpi4py +- mpld3 - nbconvert -- nodejs -- numpy +- nodejs=9.* +- numpy=1.15.0 +- numpy-base=1.15.0 - pandas - pep8 - pillow - pluggy +- protobuf - psutil - py - pyarrow @@ -54,19 +65,25 @@ dependencies: - s3fs - scikit-learn - scipy +- selenium +- setuptools +- smmap2 +- tabulate +- widgetsnbextension=3.4.0 - wrapt - xgboost - xlrd - yapf - pip: + - configparser - flatbuffers - gym[atari] - horovod - - https://dist.apache.org/repos/dist/dev/incubator/toree/0.2.0-incubating-rc5/toree-pip/toree-0.2.0.tar.gz + - https://dist.apache.org/repos/dist/dev/incubator/toree/0.2.0-incubating-rc6/toree-pip/toree-0.2.0.tar.gz - https://github.com/vishnu2kmohan/jupyter-spark-history-dcos/archive/0.1.0.zip - jupyterlab_github - knowledgelab - - mlflow + - mlflow==0.4.1 - opencv-python - pixiedust - pixiedust_node @@ -80,3 +97,4 @@ dependencies: - tensorflow==1.9.0 - tensorflow-hub - tensorflowonspark==1.3.2 + - uuid