Skip to content

Commit

Permalink
Merge pull request #428 from reyoung/feature/add_check_env_for_docker
Browse files Browse the repository at this point in the history 
Add checkout name for Dockerfile
  • Loading branch information
@reyoung
reyoung authored Nov 11, 2016
2 parents 904a43b + 64b7561 commit 818c81f
Show file tree
Hide file tree
Showing 14 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.cpu
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=OFF
ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.cpu-demo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=OFF
ENV IS_DEVEL=ON
ENV WITH_DEMO=ON
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.cpu-devel
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=OFF
ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.cpu-noavx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=OFF
ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.cpu-noavx-demo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=OFF
ENV IS_DEVEL=ON
ENV WITH_DEMO=ON
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.cpu-noavx-devel
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=OFF
ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.gpu
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=ON
ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.gpu-demo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=ON
ENV IS_DEVEL=ON
ENV WITH_DEMO=ON
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.gpu-devel
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=ON
ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.gpu-noavx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=ON
ENV IS_DEVEL=OFF
ENV WITH_DEMO=OFF
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.gpu-noavx-demo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=ON
ENV IS_DEVEL=ON
ENV WITH_DEMO=ON
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.gpu-noavx-devel
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM nvidia/cuda:7.5-cudnn5-devel-ubuntu14.04
MAINTAINER PaddlePaddle Dev Team <[email protected]>
COPY build.sh /root/
ENV GIT_CHECKOUT=develop
ENV WITH_GPU=ON
ENV IS_DEVEL=ON
ENV WITH_DEMO=OFF
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/Dockerfile.m4
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM PADDLE_BASE_IMAGE
MAINTAINER PaddlePaddle Dev Team <[email protected]>
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
Expand Down
1 change: 1 addition & 0 deletions paddle/scripts/docker/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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\
Expand Down

0 comments on commit 818c81f

Please sign in to comment.