Merge pull request #428 from reyoung/feature/add_check_env_for_docker

Add checkout name for Dockerfile
8 years ago · 818c81fecc
parent 904a43b04e 64b7561ce6
commit 818c81fecc
14 changed files with 14 additions and 0 deletions
--- a/paddle/scripts/docker/Dockerfile.cpu
+++ b/paddle/scripts/docker/Dockerfile.cpu
@ -1,6 +1,7 @@
 FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=OFF
 ENV IS_DEVEL=OFF
 ENV WITH_DEMO=OFF
--- a/paddle/scripts/docker/Dockerfile.cpu-demo
+++ b/paddle/scripts/docker/Dockerfile.cpu-demo
@ -1,6 +1,7 @@
 FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=OFF
 ENV IS_DEVEL=ON
 ENV WITH_DEMO=ON
--- a/paddle/scripts/docker/Dockerfile.cpu-devel
+++ b/paddle/scripts/docker/Dockerfile.cpu-devel
@ -1,6 +1,7 @@
 FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=OFF
 ENV IS_DEVEL=ON
 ENV WITH_DEMO=OFF
--- a/paddle/scripts/docker/Dockerfile.cpu-noavx
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx
@ -1,6 +1,7 @@
 FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=OFF
 ENV IS_DEVEL=OFF
 ENV WITH_DEMO=OFF
--- a/paddle/scripts/docker/Dockerfile.cpu-noavx-demo
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx-demo
@ -1,6 +1,7 @@
 FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=OFF
 ENV IS_DEVEL=ON
 ENV WITH_DEMO=ON
--- a/paddle/scripts/docker/Dockerfile.cpu-noavx-devel
+++ b/paddle/scripts/docker/Dockerfile.cpu-noavx-devel
@ -1,6 +1,7 @@
 FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=OFF
 ENV IS_DEVEL=ON
 ENV WITH_DEMO=OFF
--- a/paddle/scripts/docker/Dockerfile.gpu
+++ b/paddle/scripts/docker/Dockerfile.gpu
@ -1,6 +1,7 @@
 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=ON
 ENV IS_DEVEL=OFF
 ENV WITH_DEMO=OFF
--- a/paddle/scripts/docker/Dockerfile.gpu-demo
+++ b/paddle/scripts/docker/Dockerfile.gpu-demo
@ -1,6 +1,7 @@
 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=ON
 ENV IS_DEVEL=ON
 ENV WITH_DEMO=ON
--- a/paddle/scripts/docker/Dockerfile.gpu-devel
+++ b/paddle/scripts/docker/Dockerfile.gpu-devel
@ -1,6 +1,7 @@
 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=ON
 ENV IS_DEVEL=ON
 ENV WITH_DEMO=OFF
--- a/paddle/scripts/docker/Dockerfile.gpu-noavx
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx
@ -1,6 +1,7 @@
 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=ON
 ENV IS_DEVEL=OFF
 ENV WITH_DEMO=OFF
--- a/paddle/scripts/docker/Dockerfile.gpu-noavx-demo
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx-demo
@ -1,6 +1,7 @@
 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=ON
 ENV IS_DEVEL=ON
 ENV WITH_DEMO=ON
--- a/paddle/scripts/docker/Dockerfile.gpu-noavx-devel
+++ b/paddle/scripts/docker/Dockerfile.gpu-noavx-devel
@ -1,6 +1,7 @@
 FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=ON
 ENV IS_DEVEL=ON
 ENV WITH_DEMO=OFF
--- a/paddle/scripts/docker/Dockerfile.m4
+++ b/paddle/scripts/docker/Dockerfile.m4
@ -1,6 +1,7 @@
 FROM PADDLE_BASE_IMAGE
 MAINTAINER PaddlePaddle Dev Team <paddle-dev@baidu.com>
 COPY build.sh /root/
+ENV GIT_CHECKOUT=develop
 ENV WITH_GPU=PADDLE_WITH_GPU
 ENV IS_DEVEL=PADDLE_IS_DEVEL
 ENV WITH_DEMO=PADDLE_WITH_DEMO
--- a/paddle/scripts/docker/build.sh
+++ b/paddle/scripts/docker/build.sh
@ -23,6 +23,7 @@ fi
 cd ~
 git clone https://github.com/baidu/Paddle.git paddle
 cd paddle
+git checkout ${GIT_CHECKOUT}
 mkdir build
 cd build
 cmake .. -DWITH_DOC=OFF -DWITH_GPU=${WITH_GPU} -DWITH_SWIG_PY=ON\