From e84e69e1416c33db368fcace76d7db1791d6264b Mon Sep 17 00:00:00 2001
From: Yi Wang <yiwang01@baidu.com>
Date: Sun, 7 May 2017 07:27:32 -0700
Subject: [PATCH] Update Dockerfile and build.sh

---
 paddle/api/CMakeLists.txt      |  2 +-
 paddle/scripts/docker/build.sh | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/paddle/api/CMakeLists.txt b/paddle/api/CMakeLists.txt
index f2c56a4a362..1cec77c0cae 100644
--- a/paddle/api/CMakeLists.txt
+++ b/paddle/api/CMakeLists.txt
@@ -92,7 +92,7 @@ add_custom_command(OUTPUT ${PROJ_ROOT}/paddle/py_paddle/_swig_paddle.so
 # TODO(yuyang18) : make wheel name calculated by cmake
 add_custom_target(python_api_wheel ALL DEPENDS ${PROJ_ROOT}/paddle/py_paddle/_swig_paddle.so)
 
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dist/
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/dist/
     DESTINATION opt/paddle/share/wheels
 )
 
diff --git a/paddle/scripts/docker/build.sh b/paddle/scripts/docker/build.sh
index 3b458b88646..9739ec9555b 100644
--- a/paddle/scripts/docker/build.sh
+++ b/paddle/scripts/docker/build.sh
@@ -128,17 +128,6 @@ Generate /paddle/build/Dockerfile ...
 ========================================
 EOF
 
-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"
-fi
-
 cat > /paddle/build/Dockerfile <<EOF
 FROM ${BASE_IMAGE}
 MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
-- 
GitLab