From c043d718401e701012d9bdc94482b58e68498518 Mon Sep 17 00:00:00 2001
From: liaogang <liaogang@baidu.com>
Date: Wed, 8 Mar 2017 17:59:19 +0800
Subject: [PATCH 1/2] Add Book in Docker
---
.../build_and_install/docker_install_en.rst | 25 ++++++++++++++++++-
paddle/scripts/docker/Dockerfile | 6 ++---
paddle/scripts/docker/Dockerfile.gpu | 6 ++---
paddle/scripts/docker/build.sh | 3 ++-
paddle/scripts/docker/entrypoint | 2 +-
5 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/doc/getstarted/build_and_install/docker_install_en.rst b/doc/getstarted/build_and_install/docker_install_en.rst
index 5a1056e859..a92201c618 100644
--- a/doc/getstarted/build_and_install/docker_install_en.rst
+++ b/doc/getstarted/build_and_install/docker_install_en.rst
@@ -42,7 +42,7 @@ Windows -- in a consistent way.
.. code-block:: bash
- docker run -d -p 2202:22 -v $PWD:/paddle paddle:dev
+ docker run -d -p 2202:22 -p 8888:8888 -v $PWD:/paddle paddle:dev
This runs a container of the development environment Docker image
with the local source tree mounted to :code:`/paddle` of the
@@ -82,6 +82,29 @@ Windows -- in a consistent way.
cd /paddle/build
ctest
+4. Run PaddlePaddle Book under Docker Container
+
+ The Jupyter Notebook is an open-source web application that allows
+ you to create and share documents that contain live code, equations,
+ visualizations and explanatory text in a single browser.
+
+ PaddlePaddle Book is an interactive Jupyter Notebook for users and developers.
+ We already exposed port 8888 for this book. If you want to
+ dig deeper into deep learning, PaddlePaddle Book definitely is your best choice.
+
+ Once you are inside the container, simply issue the command:
+
+ .. code-block:: bash
+
+ jupyter notebook
+
+ Then, you would back and paste the address into the local browser:
+
+ .. code-block:: text
+
+ http://localhost:8888/
+
+ That's all. Enjoy your journey!
CPU-only and GPU Images
-----------------------
diff --git a/paddle/scripts/docker/Dockerfile b/paddle/scripts/docker/Dockerfile
index 98eaa15a0f..fa4aee4f8a 100644
--- a/paddle/scripts/docker/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile
@@ -34,6 +34,8 @@ RUN apt-get update && \
# git credential to skip password typing
RUN git config --global credential.helper store
+# fetch PaddlePaddle book
+RUN git submodule update --init --recursive
# Fix locales to en_US.UTF-8
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
@@ -60,9 +62,7 @@ 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
-# Jupyter Notebook directory.
-RUN mkdir /notes/
-WORKDIR "/notes"
+# Jupyter Notebook: Paddle book
EXPOSE 8888
COPY ./paddle/scripts/docker/entrypoint /opt/bin/
diff --git a/paddle/scripts/docker/Dockerfile.gpu b/paddle/scripts/docker/Dockerfile.gpu
index 4d30ccdd2b..07b32dda75 100644
--- a/paddle/scripts/docker/Dockerfile.gpu
+++ b/paddle/scripts/docker/Dockerfile.gpu
@@ -34,6 +34,8 @@ RUN apt-get update && \
# git credential to skip password typing
RUN git config --global credential.helper store
+# fetch PaddlePaddle book
+RUN git submodule update --init --recursive
# Fix locales to en_US.UTF-8
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
@@ -60,9 +62,7 @@ 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
-# Jupyter Notebook directory.
-RUN mkdir /notes/
-WORKDIR "/notes"
+# Jupyter Notebook: Paddle book
EXPOSE 8888
COPY ./paddle/scripts/docker/entrypoint /opt/bin/
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
index d9c44f4234..b2e6416c3d 100755
--- a/paddle/scripts/docker/build.sh
+++ b/paddle/scripts/docker/build.sh
@@ -17,7 +17,8 @@ if [[ ${BUILD_AND_INSTALL:-OFF} == 'ON' ]]; then
fi
mkdir -p /paddle/build # -p means no error if exists
- cd /paddle/build
+ # clean local cmake and third_party cache
+ cd /paddle/build && rm -rf * && rm -rf ../third_party
cmake .. \
-DWITH_DOC=${WITH_DOC:-OFF} \
-DWITH_GPU=${WITH_GPU:-OFF} \
diff --git a/paddle/scripts/docker/entrypoint b/paddle/scripts/docker/entrypoint
index 87083467f5..cd119917f9 100755
--- a/paddle/scripts/docker/entrypoint
+++ b/paddle/scripts/docker/entrypoint
@@ -4,5 +4,5 @@ LOG=/var/log/all
touch $LOG
/usr/sbin/sshd -D >> $LOG &
-jupyter notebook --ip=0.0.0.0 /notes/ >> $LOG &
+jupyter notebook --ip=0.0.0.0 /paddle/book/ >> $LOG &
tail -f $LOG
From b48ebd16c833ab5d6036c4ba9e6f897667ba5f33 Mon Sep 17 00:00:00 2001
From: liaogang <liaogang@baidu.com>
Date: Thu, 9 Mar 2017 09:51:10 +0800
Subject: [PATCH 2/2] Fix git submodule in docker
---
paddle/scripts/docker/Dockerfile | 4 ++--
paddle/scripts/docker/Dockerfile.gpu | 4 ++--
paddle/scripts/docker/entrypoint | 8 ++------
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/paddle/scripts/docker/Dockerfile b/paddle/scripts/docker/Dockerfile
index fa4aee4f8a..6435923c89 100644
--- a/paddle/scripts/docker/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile
@@ -34,8 +34,6 @@ RUN apt-get update && \
# git credential to skip password typing
RUN git config --global credential.helper store
-# fetch PaddlePaddle book
-RUN git submodule update --init --recursive
# Fix locales to en_US.UTF-8
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
@@ -52,7 +50,9 @@ RUN curl -sSL https://cmake.org/files/v3.4/cmake-3.4.1.tar.gz | tar -xz && \
cd .. && rm -rf cmake-3.4.1
COPY . /paddle/
+RUN cd /paddle/ && git submodule update --init --recursive
RUN /paddle/paddle/scripts/docker/build.sh
+
VOLUME ["/usr/share/nginx/html/data", "/usr/share/nginx/html/paddle"]
# Configure OpenSSH server. c.f. https://docs.docker.com/engine/examples/running_ssh_service
diff --git a/paddle/scripts/docker/Dockerfile.gpu b/paddle/scripts/docker/Dockerfile.gpu
index 07b32dda75..06e53a0ef3 100644
--- a/paddle/scripts/docker/Dockerfile.gpu
+++ b/paddle/scripts/docker/Dockerfile.gpu
@@ -34,8 +34,6 @@ RUN apt-get update && \
# git credential to skip password typing
RUN git config --global credential.helper store
-# fetch PaddlePaddle book
-RUN git submodule update --init --recursive
# Fix locales to en_US.UTF-8
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
@@ -52,7 +50,9 @@ RUN curl -sSL https://cmake.org/files/v3.4/cmake-3.4.1.tar.gz | tar -xz && \
cd .. && rm -rf cmake-3.4.1
COPY . /paddle/
+RUN cd /paddle/ && git submodule update --init --recursive
RUN /paddle/paddle/scripts/docker/build.sh
+
VOLUME ["/usr/share/nginx/html/data", "/usr/share/nginx/html/paddle"]
# Configure OpenSSH server. c.f. https://docs.docker.com/engine/examples/running_ssh_service
diff --git a/paddle/scripts/docker/entrypoint b/paddle/scripts/docker/entrypoint
index cd119917f9..bc194bd909 100755
--- a/paddle/scripts/docker/entrypoint
+++ b/paddle/scripts/docker/entrypoint
@@ -1,8 +1,4 @@
#!/bin/bash
-LOG=/var/log/all
-touch $LOG
-
-/usr/sbin/sshd -D >> $LOG &
-jupyter notebook --ip=0.0.0.0 /paddle/book/ >> $LOG &
-tail -f $LOG
+/usr/sbin/sshd -D &
+jupyter notebook --ip=0.0.0.0 /paddle/book/