Skip to content

Commit

Permalink
Merge d3cdff4 into 0d32d4f
Browse files Browse the repository at this point in the history
  • Loading branch information
cavaunpeu committed Jan 10, 2018
2 parents 0d32d4f + d3cdff4 commit d53002d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
5 changes: 2 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ USER edward
ARG python_version=3.5.3-0
ARG python_qt_version=4
RUN conda install -y python=${python_version} && \
pip install numpy six tensorflow keras prettytensor && \
pip install observations numpy six tensorflow keras prettytensor && \
pip install ipdb pytest pytest-cov python-coveralls coverage==3.7.1 pytest-xdist pep8 pytest-pep8 pydot_ng && \
conda install Pillow scikit-learn matplotlib notebook observations pandas seaborn pyyaml h5py && \
conda install Pillow scikit-learn matplotlib notebook pandas seaborn pyyaml h5py && \
conda install -y pyqt=${python_qt_version} && \
pip install edward && \
conda clean -yt
Expand All @@ -59,4 +59,3 @@ WORKDIR /src
EXPOSE 8888

CMD jupyter notebook --port=8888 --ip=0.0.0.0

5 changes: 2 additions & 3 deletions docker/Dockerfile-gpu
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ USER edward
# Python
ARG python_version=3.5.3-0
RUN conda install -y python=${python_version} && \
pip install numpy six tensorflow-gpu keras prettytensor && \
pip install observations numpy six tensorflow-gpu keras prettytensor && \
pip install ipdb pytest pytest-cov python-coveralls coverage==3.7.1 pytest-xdist pep8 pytest-pep8 pydot_ng && \
conda install Pillow scikit-learn matplotlib notebook observations pandas seaborn pyyaml h5py && \
conda install Pillow scikit-learn matplotlib notebook pandas seaborn pyyaml h5py && \
pip install edward && \
conda clean -yt

Expand All @@ -58,4 +58,3 @@ WORKDIR /src
EXPOSE 8888

CMD jupyter notebook --port=8888 --ip=0.0.0.0

0 comments on commit d53002d

Please sign in to comment.