未验证 提交 d2b0c489 编写于 作者: T Tao Luo 提交者: GitHub

Merge pull request #10511 from wanglei828/fixdockerfile

Dockerfile: fix production dockefile when WITH_GOLANG=OFF.
...@@ -398,7 +398,7 @@ function gen_dockerfile() { ...@@ -398,7 +398,7 @@ function gen_dockerfile() {
cat <<EOF cat <<EOF
======================================== ========================================
Generate /paddle/build/Dockerfile ... Generate ${PADDLE_ROOT}/build/Dockerfile ...
======================================== ========================================
EOF EOF
...@@ -422,7 +422,7 @@ EOF ...@@ -422,7 +422,7 @@ EOF
CMD='"true"' CMD='"true"'
fi fi
cat >> /paddle/build/Dockerfile <<EOF cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
ADD python/dist/*.whl / ADD python/dist/*.whl /
# run paddle version to install python packages first # run paddle version to install python packages first
RUN apt-get update &&\ RUN apt-get update &&\
...@@ -436,8 +436,14 @@ EOF ...@@ -436,8 +436,14 @@ EOF
${DOCKERFILE_CUDNN_DSO} ${DOCKERFILE_CUDNN_DSO}
${DOCKERFILE_GPU_ENV} ${DOCKERFILE_GPU_ENV}
ENV NCCL_LAUNCH_MODE PARALLEL ENV NCCL_LAUNCH_MODE PARALLEL
ADD go/cmd/pserver/pserver /usr/bin/ EOF
ADD go/cmd/master/master /usr/bin/ if [[ ${WITH_GOLANG:-OFF} == "ON" ]]; then
cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
ADD go/cmd/pserver/pserver /usr/bin/
ADD go/cmd/master/master /usr/bin/
EOF
fi
cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
# default command shows the paddle version and exit # default command shows the paddle version and exit
CMD [${CMD}] CMD [${CMD}]
EOF EOF
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册