From 68c89bcc522f8dfac53302f06547872bc92597f8 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Mon, 26 Dec 2016 21:24:10 +0800
Subject: [PATCH] Add jupyter notebook support in Docker images.

---
 paddle/scripts/docker/Dockerfile     | 13 +++++++++++--
 paddle/scripts/docker/Dockerfile.gpu | 13 +++++++++++--
 paddle/scripts/docker/build.sh       |  4 +++-
 paddle/scripts/docker/run_all        |  8 ++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100755 paddle/scripts/docker/run_all

diff --git a/paddle/scripts/docker/Dockerfile b/paddle/scripts/docker/Dockerfile
index b01de499b..46363b05b 100644
--- a/paddle/scripts/docker/Dockerfile
+++ b/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,13 @@ 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/bin
+COPY ./paddle/scripts/docker/run_all /opt/bin/
+
+CMD ["/opt/bin/run_all"]
diff --git a/paddle/scripts/docker/Dockerfile.gpu b/paddle/scripts/docker/Dockerfile.gpu
index a68cc79b8..072c14481 100644
--- a/paddle/scripts/docker/Dockerfile.gpu
+++ b/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,13 @@ 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/bin
+COPY ./paddle/scripts/docker/run_all /opt/bin/
+
+CMD ["/opt/bin/run_all"]
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
index ca3f1c3f1..7edba3dd0 100755
--- a/paddle/scripts/docker/build.sh
+++ b/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
diff --git a/paddle/scripts/docker/run_all b/paddle/scripts/docker/run_all
new file mode 100755
index 000000000..87083467f
--- /dev/null
+++ b/paddle/scripts/docker/run_all
@@ -0,0 +1,8 @@
+#!/bin/bash
+LOG=/var/log/all
+
+touch $LOG
+
+/usr/sbin/sshd -D >> $LOG &
+jupyter notebook --ip=0.0.0.0 /notes/ >> $LOG &
+tail -f $LOG
-- 
GitLab