Merge branch 'feature/jupyter_docker' into feature/python_trainer_api

Author: reyoung

paddle/scripts/docker/00_sshd

@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/sbin/sshd -D

paddle/scripts/docker/01_jupyter

@@ -0,0 +1,2 @@
+#!/bin/bash
+jupyter notebook /notes/

paddle/scripts/docker/Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get update \
     && apt-get clean -y
 RUN cd /usr/src/gtest && cmake . && make && cp *.a /usr/lib
 RUN pip install -U BeautifulSoup docopt PyYAML pillow \
-    sphinx sphinx_rtd_theme recommonmark
+    sphinx sphinx_rtd_theme recommonmark jupyter
 
 ARG WITH_AVX
 ARG WITH_DOC
@@ -43,4 +43,16 @@ RUN echo 'root:root' | chpasswd
 RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
 RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
 EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
+
+# Jupyter Notebook directory.
+RUN mkdir /notes/
+WORKDIR "/notes"
+EXPOSE 8888
+
+RUN mkdir -p /opt/run
+COPY ./paddle/scripts/docker/jupyter_notebook_config.py /root/.jupyter/
+COPY ./paddle/scripts/docker/00_sshd /opt/run/
+COPY ./paddle/scripts/docker/01_jupyter /opt/run/
+COPY ./paddle/scripts/docker/run_all /opt/bin/
+
+CMD ["/opt/bin/run_all"]

paddle/scripts/docker/Dockerfile.gpu

@@ -15,7 +15,7 @@ RUN apt-get update \
     && apt-get clean -y
 RUN cd /usr/src/gtest && cmake . && make && cp *.a /usr/lib
 RUN pip install -U BeautifulSoup docopt PyYAML pillow \
-    sphinx sphinx_rtd_theme recommonmark
+    sphinx sphinx_rtd_theme recommonmark jupyter
 
 ARG WITH_AVX
 ARG WITH_DOC
@@ -43,4 +43,16 @@ RUN echo 'root:root' | chpasswd
 RUN sed -ri 's/^PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
 RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
 EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D"]
+
+# Jupyter Notebook directory.
+RUN mkdir /notes/
+WORKDIR "/notes"
+EXPOSE 8888
+
+RUN mkdir -p /opt/run
+COPY ./paddle/scripts/docker/jupyter_notebook_config.py /root/.jupyter/
+COPY ./paddle/scripts/docker/00_sshd /opt/run/
+COPY ./paddle/scripts/docker/01_jupyter /opt/run/
+COPY ./paddle/scripts/docker/run_all /opt/bin/
+
+CMD ["/opt/bin/run_all"]

paddle/scripts/docker/build.sh

@@ -43,5 +43,7 @@ cp -rv /woboq/data $WOBOQ_OUT/../data
     -o $WOBOQ_OUT \
     -p paddle:/paddle
 /woboq/indexgenerator/codebrowser_indexgenerator $WOBOQ_OUT
-
+cd /woboq
+make clean
+rm -rf /paddle/build
 trap : 0

paddle/scripts/docker/jupyter_notebook_config.py

@@ -0,0 +1,27 @@
+# from https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/docker/jupyter_notebook_config.py
+# Copyright 2015 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+import os
+from IPython.lib import passwd
+
+c.NotebookApp.ip = '*'
+c.NotebookApp.port = int(os.getenv('PORT', 8888))
+c.NotebookApp.open_browser = False
+c.MultiKernelManager.default_kernel_name = 'python2'
+
+# sets a password if PASSWORD is set in the environment
+if 'PASSWORD' in os.environ:
+  c.NotebookApp.password = passwd(os.environ['PASSWORD'])
+  del os.environ['PASSWORD']

paddle/scripts/docker/run_all

@@ -0,0 +1,13 @@
+#!/bin/bash
+# http://stackoverflow.com/questions/18805073/docker-multiple-entrypoints
+
+LOG=/var/log/all
+
+touch $LOG
+
+for a in /opt/run/*
+do
+    $a >> $LOG &
+done
+
+tail -f $LOG