diff --git a/cmake/third_party.cmake b/cmake/third_party.cmake index 1efc12a1e37faff54968dbf056a4ede424eeba77..4ad2f84d33240558096bb43b274e988b9b2be210 100644 --- a/cmake/third_party.cmake +++ b/cmake/third_party.cmake @@ -17,7 +17,6 @@ include(ExternalProject) set(THIRD_PARTY_PATH "${CMAKE_BINARY_DIR}/third_party" CACHE STRING "A path setting third party libraries download & build directories.") - set(THIRD_PARTY_CACHE_PATH "${CMAKE_SOURCE_DIR}" CACHE STRING "A path cache third party source code to avoid repeated download.") diff --git a/tools/dockerfile/Dockerfile.centos b/tools/dockerfile/Dockerfile.centos index 337874dac1b3f21d9d7e03171d209b7441d826c2..108d2e5705c529fee2cc9dc744caa491cd612274 100644 --- a/tools/dockerfile/Dockerfile.centos +++ b/tools/dockerfile/Dockerfile.centos @@ -20,15 +20,18 @@ RUN bash build_scripts/install_nccl2.sh RUN bash build_scripts/install_trt.sh RUN rm -rf build_scripts -ENV SSL_CERT_FILE=/opt/_internal/certs.pem - # git 2.17.1 RUN wget -q https://paddle-ci.gz.bcebos.com/git-2.17.1.tar.gz && \ tar -xvf git-2.17.1.tar.gz && \ cd git-2.17.1 && \ - ./configure --with-openssl=/usr/local/ssl --prefix=/usr/local && \ + ./configure --with-openssl --prefix=/usr/local && \ make -j8 && make install +ENV SSL_CERT_FILE=/opt/_internal/certs.pem +ENV GOROOT=/usr/local/go GOPATH=/root/gopath +ENV PATH=/usr/local/ssl:${GOROOT}/bin:${GOPATH}/bin:${PATH} +ENV LIBRARY_PATH=/usr/local/ssl/lib:$LIBRARY_PATH + # for paddle RUN wget --no-check-certificate -qO- https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz | \ tar -xz -C /usr/local && \ @@ -37,9 +40,6 @@ RUN wget --no-check-certificate -qO- https://storage.googleapis.com/golang/go1.8 mkdir /root/gopath/src -ENV GOROOT=/usr/local/go GOPATH=/root/gopath -ENV PATH=/usr/local/ssl:${GOROOT}/bin:${GOPATH}/bin:${PATH} - # protobuf 3.6.1 RUN cd /opt && wget -q --no-check-certificate https://paddle-ci.cdn.bcebos.com/protobuf-cpp-3.6.1.tar.gz && \ tar xzf protobuf-cpp-3.6.1.tar.gz && \ diff --git a/tools/dockerfile/build_scripts/build.sh b/tools/dockerfile/build_scripts/build.sh index aca95a58f6b56f586efbe38cb7a56c2990c409ff..f7ab3a03ab1d9a71affc144f8e9f30cef44649c1 100644 --- a/tools/dockerfile/build_scripts/build.sh +++ b/tools/dockerfile/build_scripts/build.sh @@ -28,8 +28,8 @@ CPYTHON_VERSIONS="3.8.0 3.7.0 3.6.0 3.5.1 2.7.15" # openssl version to build, with expected sha256 hash of .tar.gz # archive -OPENSSL_ROOT=openssl-1.1.0i -OPENSSL_HASH=ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99 +OPENSSL_ROOT=openssl-1.0.2g +OPENSSL_HASH=b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 PATCHELF_HASH=f2aa40a6148cb3b0ca807a1bf836b081793e55ec9e5540a5356d800132be7e0a CURL_ROOT=curl-7.49.1 CURL_HASH=eb63cec4bef692eab9db459033f409533e6d10e20942f4b060b32819e81885f1