From 00a1ade83598685f00d42b52e713b7c921f4b253 Mon Sep 17 00:00:00 2001 From: Hongjoo Lee Date: Wed, 27 Jul 2016 15:21:21 +0900 Subject: [PATCH 1/3] add sqlalchemy to conda install command --- scipy-notebook/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index ff9a1784..3cebc4e1 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -62,6 +62,7 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'numba=0.23*' \ 'bokeh=0.11*' \ 'h5py=2.5*' \ + 'sqlalchemy=1.0*' \ 'pyzmq' && \ conda remove -n python2 --quiet --yes --force qt pyqt && \ conda clean -tipsy From 28a1b3695e91a105f1fcdbf90f33ec638fbce5f1 Mon Sep 17 00:00:00 2001 From: Hongjoo Lee Date: Thu, 28 Jul 2016 17:37:49 +0900 Subject: [PATCH 2/3] explicitly install SQLAlchemy for both python2 and python3. also add libmysqlclient and python wrappers for the most popular uses --- scipy-notebook/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 3cebc4e1..d426fca5 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -9,6 +9,7 @@ USER root # libav-tools for matplotlib anim RUN apt-get update && \ apt-get install -y --no-install-recommends libav-tools && \ + apt-get install -y --no-install-recommends libmysqlclient-dev && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -34,9 +35,15 @@ RUN conda install --quiet --yes \ 'dill=0.2*' \ 'numba=0.23*' \ 'bokeh=0.11*' \ + 'sqlalchemy=1.0*' \ 'h5py=2.5*' && \ conda remove --quiet --yes --force qt pyqt && \ conda clean -tipsy + +# Install mysqlclient for python 3 not by conda which couldn't find proper package +# name by pip instead. +RUN pip install -q --no-cache-dir mysqlclient==1.3.7 + # Activate ipywidgets extension in the environment that runs the notebook server RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix @@ -63,6 +70,7 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'bokeh=0.11*' \ 'h5py=2.5*' \ 'sqlalchemy=1.0*' \ + 'MySQL-python=1.2*' \ 'pyzmq' && \ conda remove -n python2 --quiet --yes --force qt pyqt && \ conda clean -tipsy From ebbaaa15b2d296c12fef33ee802e9928931b5ede Mon Sep 17 00:00:00 2001 From: Hongjoo Lee Date: Thu, 28 Jul 2016 22:22:13 +0900 Subject: [PATCH 3/3] remove mysql stuff --- scipy-notebook/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index d426fca5..e6a939ba 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -9,7 +9,6 @@ USER root # libav-tools for matplotlib anim RUN apt-get update && \ apt-get install -y --no-install-recommends libav-tools && \ - apt-get install -y --no-install-recommends libmysqlclient-dev && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -40,10 +39,6 @@ RUN conda install --quiet --yes \ conda remove --quiet --yes --force qt pyqt && \ conda clean -tipsy -# Install mysqlclient for python 3 not by conda which couldn't find proper package -# name by pip instead. -RUN pip install -q --no-cache-dir mysqlclient==1.3.7 - # Activate ipywidgets extension in the environment that runs the notebook server RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix @@ -70,7 +65,6 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'bokeh=0.11*' \ 'h5py=2.5*' \ 'sqlalchemy=1.0*' \ - 'MySQL-python=1.2*' \ 'pyzmq' && \ conda remove -n python2 --quiet --yes --force qt pyqt && \ conda clean -tipsy