Skip to content

Commit d2b0c48

Browse files
authored
Merge pull request #10511 from wanglei828/fixdockerfile
Dockerfile: fix production dockefile when WITH_GOLANG=OFF.
2 parents 5c26f16 + 61eb3aa commit d2b0c48

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

paddle/scripts/paddle_build.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ function gen_dockerfile() {
398398

399399
cat <<EOF
400400
========================================
401-
Generate /paddle/build/Dockerfile ...
401+
Generate ${PADDLE_ROOT}/build/Dockerfile ...
402402
========================================
403403
EOF
404404

@@ -422,7 +422,7 @@ EOF
422422
CMD='"true"'
423423
fi
424424

425-
cat >> /paddle/build/Dockerfile <<EOF
425+
cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
426426
ADD python/dist/*.whl /
427427
# run paddle version to install python packages first
428428
RUN apt-get update &&\
@@ -436,8 +436,14 @@ EOF
436436
${DOCKERFILE_CUDNN_DSO}
437437
${DOCKERFILE_GPU_ENV}
438438
ENV NCCL_LAUNCH_MODE PARALLEL
439-
ADD go/cmd/pserver/pserver /usr/bin/
440-
ADD go/cmd/master/master /usr/bin/
439+
EOF
440+
if [[ ${WITH_GOLANG:-OFF} == "ON" ]]; then
441+
cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
442+
ADD go/cmd/pserver/pserver /usr/bin/
443+
ADD go/cmd/master/master /usr/bin/
444+
EOF
445+
fi
446+
cat >> ${PADDLE_ROOT}/build/Dockerfile <<EOF
441447
# default command shows the paddle version and exit
442448
CMD [${CMD}]
443449
EOF

0 commit comments

Comments
 (0)