提交 69e6a0f5 编写于 作者: Y yi.wu

fix docker image pythonhome

上级 caffcc83
...@@ -9,6 +9,9 @@ if [ ${WITH_GPU} == "ON" ]; then ...@@ -9,6 +9,9 @@ if [ ${WITH_GPU} == "ON" ]; then
GPU_DOCKER_PKG="python-pip python-dev" GPU_DOCKER_PKG="python-pip python-dev"
else else
BASE_IMAGE="python:2.7.13-slim" 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 fi
DOCKERFILE_GPU_ENV="" DOCKERFILE_GPU_ENV=""
...@@ -97,6 +100,7 @@ ADD build/*.deb /usr/local/opt/paddle/deb/ ...@@ -97,6 +100,7 @@ ADD build/*.deb /usr/local/opt/paddle/deb/
RUN dpkg -i /usr/local/opt/paddle/deb/*.deb && \ RUN dpkg -i /usr/local/opt/paddle/deb/*.deb && \
rm -f /usr/local/opt/paddle/deb/*.deb && \ rm -f /usr/local/opt/paddle/deb/*.deb && \
paddle version paddle version
${CPU_DOCKER_PYTHON_HOME_ENV}
${DOCKERFILE_CUDNN_DSO} ${DOCKERFILE_CUDNN_DSO}
${DOCKERFILE_GPU_ENV} ${DOCKERFILE_GPU_ENV}
# default command shows the paddle version and exit # default command shows the paddle version and exit
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册