From f192800091beb3aa0b90e33ff2b32ca6d537ed93 Mon Sep 17 00:00:00 2001
From: reyoung <reyoung@linux.laptop>
Date: Mon, 24 Apr 2017 17:41:55 +0800
Subject: [PATCH] Refine Docker build

---
 cmake/package.cmake            |  2 +-
 paddle/scripts/deb/postinst    |  6 ++++++
 paddle/scripts/docker/build.sh | 28 +++-------------------------
 python/setup.py.in             |  3 ++-
 4 files changed, 12 insertions(+), 27 deletions(-)
 create mode 100644 paddle/scripts/deb/postinst

diff --git a/cmake/package.cmake b/cmake/package.cmake
index 06c0910f0e5..4f8467a520f 100644
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -1,5 +1,4 @@
 set(CPACK_PACKAGE_NAME paddle)
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "")
 set(CPACK_PACKAGE_VERSION_MAJOR ${PADDLE_MAJOR_VERSION})
 set(CPACK_PACKAGE_VERSION_MINOR ${PADDLE_MINOR_VERSION})
 set(CPACK_PACKAGE_VERSION_PATCH ${PADDLE_PATCH_VERSION})
@@ -12,6 +11,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Paddle")
 set(CPACK_PACKAGE_DESCRIPTION "")
 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_VERSION ${PADDLE_VERSION})
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJ_ROOT}/paddle/scripts/deb/postinst")
 #set(CPACK_GENERATOR "DEB")
 # Start cpack
diff --git a/paddle/scripts/deb/postinst b/paddle/scripts/deb/postinst
new file mode 100644
index 00000000000..91620b1ee75
--- /dev/null
+++ b/paddle/scripts/deb/postinst
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+echo "Post install paddle debian package."
+echo "Install some python package used for paddle. You can run "
+echo "  pip install /usr/opt/paddle/share/wheels/*.whl to install them."
+find /usr/ -name '*paddle*.whl' | xargs pip install
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
index 8df182ef7b0..69a4319e014 100644
--- a/paddle/scripts/docker/build.sh
+++ b/paddle/scripts/docker/build.sh
@@ -5,13 +5,8 @@ set -e
 # Set BASE_IMAGE according to env variables
 if [ ${WITH_GPU} == "ON" ]; then
   BASE_IMAGE="nvidia/cuda:8.0-cudnn5-runtime-ubuntu14.04"
-  # additional packages to install when building gpu images
-  GPU_DOCKER_PKG="python-pip python-dev"
 else
-  BASE_IMAGE="python:2.7.13-slim"
-  # FIXME: python base image uses different python version than WITH_GPU
-  # need to change PYTHONHOME to /usr/local when using python base image
-  CPU_DOCKER_PYTHON_HOME_ENV="ENV PYTHONHOME /usr/local"
+  BASE_IMAGE="ubuntu:14.04"
 fi
 
 DOCKERFILE_GPU_ENV=""
@@ -88,12 +83,6 @@ fi
 
 paddle version
 
-if [[ -n ${APT_MIRROR} ]]; then
-  MIRROR_UPDATE="sed -i '${APT_MIRROR}' /etc/apt/sources.list"
-else
-  MIRROR_UPDATE=""
-fi
-
 cat > /paddle/build/Dockerfile <<EOF
 FROM ${BASE_IMAGE}
 MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
@@ -102,23 +91,13 @@ 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}
-EOF
-fi
-
-if [[ -n ${GPU_DOCKER_PKG} ]]; then
+if [[ -n ${APT_MIRROR} ]]; then
 cat >> /paddle/build/Dockerfile <<EOF
-RUN apt-get update && \
-    apt-get install -y ${GPU_DOCKER_PKG} && \
-    apt-get clean -y
+RUN sed -i '${APT_MIRROR}' /etc/apt/sources.list
 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 /
 # run paddle version to install python packages first
@@ -127,7 +106,6 @@ RUN apt-get update &&\
     apt-get clean -y && \
     rm -f /*.deb && \
     paddle version
-${CPU_DOCKER_PYTHON_HOME_ENV}
 ${DOCKERFILE_CUDNN_DSO}
 ${DOCKERFILE_GPU_ENV}
 # default command shows the paddle version and exit
diff --git a/python/setup.py.in b/python/setup.py.in
index e5395ee3964..83e505f566d 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -16,7 +16,8 @@ setup(name='paddle',
       packages=packages,
       install_requires=[
           "numpy",
-          "protobuf==3.1.0"
+          "protobuf==3.1.0",
+          "matplotlib",
       ],
       package_dir={
           '': '${CMAKE_CURRENT_SOURCE_DIR}'
-- 
GitLab