From 68c89bcc522f8dfac53302f06547872bc92597f8 Mon Sep 17 00:00:00 2001 From: Yu Yang Date: Mon, 26 Dec 2016 21:24:10 +0800 Subject: [PATCH 1/2] 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 b01de499bd1fb..46363b05b7e21 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 a68cc79b84271..072c14481823a 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 ca3f1c3f1896f..7edba3dd09cdc 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 0000000000000..87083467f50ac --- /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 From a080aa7a1c3936fd3e6ad27091873947c178c0dc Mon Sep 17 00:00:00 2001 From: Yu Yang Date: Wed, 4 Jan 2017 10:27:34 +0800 Subject: [PATCH 2/2] Change run_all => entrypoint. --- paddle/scripts/docker/Dockerfile | 4 ++-- paddle/scripts/docker/Dockerfile.gpu | 4 ++-- paddle/scripts/docker/{run_all => entrypoint} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename paddle/scripts/docker/{run_all => entrypoint} (100%) diff --git a/paddle/scripts/docker/Dockerfile b/paddle/scripts/docker/Dockerfile index 46363b05b7e21..1522be023f6de 100644 --- a/paddle/scripts/docker/Dockerfile +++ b/paddle/scripts/docker/Dockerfile @@ -50,6 +50,6 @@ WORKDIR "/notes" EXPOSE 8888 RUN mkdir -p /opt/bin -COPY ./paddle/scripts/docker/run_all /opt/bin/ +COPY ./paddle/scripts/docker/entrypoint /opt/bin/ -CMD ["/opt/bin/run_all"] +CMD ["/opt/bin/entrypoint"] diff --git a/paddle/scripts/docker/Dockerfile.gpu b/paddle/scripts/docker/Dockerfile.gpu index 072c14481823a..09f07043e2172 100644 --- a/paddle/scripts/docker/Dockerfile.gpu +++ b/paddle/scripts/docker/Dockerfile.gpu @@ -50,6 +50,6 @@ WORKDIR "/notes" EXPOSE 8888 RUN mkdir -p /opt/bin -COPY ./paddle/scripts/docker/run_all /opt/bin/ +COPY ./paddle/scripts/docker/entrypoint /opt/bin/ -CMD ["/opt/bin/run_all"] +CMD ["/opt/bin/entrypoint"] diff --git a/paddle/scripts/docker/run_all b/paddle/scripts/docker/entrypoint similarity index 100% rename from paddle/scripts/docker/run_all rename to paddle/scripts/docker/entrypoint