From 5f41d2814bb951e662e009f6e394e0ee5ff2cc08 Mon Sep 17 00:00:00 2001
From: reyoung <reyoung@linux.laptop>
Date: Mon, 24 Apr 2017 15:24:52 +0800
Subject: [PATCH] Make docker build use deb package.

---
 cmake/package.cmake            |  2 +-
 paddle/scripts/docker/build.sh | 41 +++++++++++++++++++++-------------
 python/setup.py.in             |  4 ++++
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/cmake/package.cmake b/cmake/package.cmake
index 6f3a50b6c6..06c0910f0e 100644
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -10,7 +10,7 @@ set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER PaddlePaddle Dev <paddle-dev@baidu.com>)
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Paddle")
 set(CPACK_PACKAGE_DESCRIPTION "")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libpython2.7, libstdc++6, python-pip, curl")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libpython2.7, libstdc++6, python-pip, curl, libgfortran3, python-pip-whl")
 set(CPACK_DEBIAN_PACKAGE_SECTION Devel)
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJ_ROOT}/paddle/scripts/deb/postinst")
 #set(CPACK_GENERATOR "DEB")
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
index 48e8e912b8..c17578b14e 100644
--- a/paddle/scripts/docker/build.sh
+++ b/paddle/scripts/docker/build.sh
@@ -44,10 +44,7 @@ fi
 make install
 
 # generate deb package for current build
-# FIXME(typhoonzero): should we remove paddle/scripts/deb ?
-# FIXME: CPACK_DEBIAN_PACKAGE_DEPENDS removes all dev dependencies, must
-# install them in docker
-cpack -D CPACK_GENERATOR='DEB' -D CPACK_DEBIAN_PACKAGE_DEPENDS="" ..
+cpack -D CPACK_GENERATOR='DEB' ..
 
 if [[ ${WOBOQ:-OFF} == 'ON' ]]; then
     apt-get install -y clang-3.8 llvm-3.8 libclang-3.8-dev
@@ -76,9 +73,9 @@ fi
 paddle version
 
 if [[ -n ${APT_MIRROR} ]]; then
-  MIRROR_UPDATE="sed -i '${APT_MIRROR}' /etc/apt/sources.list && \\"
+  MIRROR_UPDATE="sed -i '${APT_MIRROR}' /etc/apt/sources.list"
 else
-  MIRROR_UPDATE="\\"
+  MIRROR_UPDATE=""
 fi
 
 cat > /paddle/build/Dockerfile <<EOF
@@ -87,18 +84,32 @@ MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
 ENV HOME /root
 ENV LANG en_US.UTF-8
 # Use Fix locales to en_US.UTF-8
+EOF
+
+if [[ -n ${MIRROR_UPDATE} ]]; then
+cat >> /paddle/build/Dockerfile <<EOF
 RUN ${MIRROR_UPDATE}
-    apt-get update && \
-    apt-get install -y libgfortran3 libpython2.7 ${GPU_DOCKER_PKG} && \
-    apt-get clean -y && \
-    pip install --upgrade pip && \
-    pip install -U 'protobuf==3.1.0' requests numpy
+EOF
+fi
+
+if [[ -n ${GPU_DOCKER_PKG} ]]; then
+cat >> /paddle/build/Dockerfile <<EOF
+RUN apt-get update && \
+    apt-get install -y ${GPU_DOCKER_PKG} && \
+    apt-get clean -y
+EOF
+fi
+
+cat >> /paddle/build/Dockerfile <<EOF
+RUN pip install --upgrade pip
+
 # Use different deb file when building different type of images
-ADD build/*.deb /usr/local/opt/paddle/deb/
+ADD build/*.deb /
 # run paddle version to install python packages first
-RUN dpkg -i /usr/local/opt/paddle/deb/*.deb && \
-    apt-get -f && \
-    rm -f /usr/local/opt/paddle/deb/*.deb && \
+RUN apt-get update &&\
+    dpkg -i /*.deb ; apt-get install -f -y && \
+    apt-get clean -y && \
+    rm -f /*.deb && \
     pip install /usr/opt/paddle/share/wheels/*.whl && \
     paddle version
 ${CPU_DOCKER_PYTHON_HOME_ENV}
diff --git a/python/setup.py.in b/python/setup.py.in
index 4ac35e3b8d..e5395ee396 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -14,6 +14,10 @@ setup(name='paddle',
       version='${PADDLE_VERSION}',
       description='Parallel Distributed Deep Learning',
       packages=packages,
+      install_requires=[
+          "numpy",
+          "protobuf==3.1.0"
+      ],
       package_dir={
           '': '${CMAKE_CURRENT_SOURCE_DIR}'
       }
-- 
GitLab