From e576f2667b78771f9ef5176e32ddf9397772e754 Mon Sep 17 00:00:00 2001
From: chengduo <zhaochengduo@baidu.com>
Date: Sun, 7 Jul 2019 21:45:00 +0800
Subject: [PATCH] update docker build (#18523)

test=develop
---
 paddle/scripts/paddle_build.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/paddle/scripts/paddle_build.sh b/paddle/scripts/paddle_build.sh
index db9994d332..5317a6cf36 100755
--- a/paddle/scripts/paddle_build.sh
+++ b/paddle/scripts/paddle_build.sh
@@ -824,7 +824,7 @@ EOF
 EOF
 
     if [[ ${WITH_GPU} == "ON"  ]]; then
-        NCCL_DEPS="apt-get install -y --allow-downgrades libnccl2=2.2.13-1+cuda${CUDA_MAJOR} libnccl-dev=2.2.13-1+cuda${CUDA_MAJOR} || true"
+        NCCL_DEPS="apt-get install -y --allow-change-held-packages libnccl2=2.4.7-1+cuda${CUDA_MAJOR} libnccl-dev=2.4.7-1+cuda${CUDA_MAJOR} || true"
     else
         NCCL_DEPS="true"
     fi
@@ -915,12 +915,6 @@ EOF
     # default command shows the paddle version and exit
     CMD [${CMD}]
 EOF
-    if [[ ${WITH_GPU} == "ON"  ]]; then
-        cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
-    RUN rm /usr/lib/x86_64-linux-gnu/libnccl.so
-    RUN ln -s /usr/lib/x86_64-linux-gnu/libnccl.so.2 /usr/lib/x86_64-linux-gnu/libnccl.so
-EOF
-    fi
 }
 
 function gen_fluid_lib() {
-- 
GitLab