Skip to content

Commit 9e9ae2f

Browse files
authored
Merge pull request #996 from gangliao/bazel
Remove bazel from dockerfile and docs
2 parents dae8b9b + bffc198 commit 9e9ae2f

File tree

17 files changed

+1
-343
lines changed

17 files changed

+1
-343
lines changed

WORKSPACE

Lines changed: 0 additions & 31 deletions
This file was deleted.

doc/getstarted/build_and_install/docker_install_en.rst

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,13 @@ The general development workflow with Docker and Bazel is as follows:
6565
--name paddle \
6666
-p 2022:22 \
6767
-v $PWD:/paddle \
68-
-v $HOME/.cache/bazel:/root/.cache/bazel \
6968
paddle:dev
7069
7170
where :code:`-d` makes the container running in background,
7271
:code:`--name paddle` allows us to run a nginx container to serve
7372
documents in this container, :code:`-p 2022:22` allows us to SSH
7473
into this container, :code:`-v $PWD:/paddle` shares the source code
75-
on the host with the container, :code:`-v
76-
$HOME/.cache/bazel:/root/.cache/bazel` shares Bazel cache on the
77-
host with the container.
74+
on the host with the container.
7875

7976
4. SSH into the container:
8077

@@ -94,13 +91,6 @@ The general development workflow with Docker and Bazel is as follows:
9491
make -j `nproc`
9592
CTEST_OUTPUT_ON_FAILURE=1 ctest
9693
97-
or Bazel in the container:
98-
99-
.. code-block:: bash
100-
101-
cd /paddle
102-
bazel test ...
103-
10494
10595
CPU-only and GPU Images
10696
-----------------------

paddle/scripts/docker/Dockerfile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,6 @@ RUN cd /usr/src/gtest && cmake . && make && cp *.a /usr/lib
1717
RUN pip install -U BeautifulSoup docopt PyYAML pillow \
1818
sphinx sphinx_rtd_theme recommonmark
1919

20-
# cmake tends to hide and blur the dependencies between code modules, as
21-
# noted here https://github.com/PaddlePaddle/Paddle/issues/763. We are
22-
# thinking about using Bazel to fix this problem, e.g.,
23-
# https://github.com/PaddlePaddle/Paddle/issues/681#issuecomment-263996102. To
24-
# start the trail of fixing, we add Bazel to our Dockerfiles.
25-
RUN apt-get update && apt-get install -y curl software-properties-common \
26-
&& add-apt-repository ppa:webupd8team/java \
27-
&& echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections \
28-
&& echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
29-
&& curl https://bazel.build/bazel-release.pub.gpg | apt-key add - \
30-
&& apt-get update && apt-get install -y oracle-java8-installer bazel
31-
3220
ARG WITH_AVX
3321
ARG WITH_DOC
3422
ARG WITH_SWIG_PY

paddle/scripts/docker/Dockerfile.gpu

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,6 @@ RUN cd /usr/src/gtest && cmake . && make && cp *.a /usr/lib
1717
RUN pip install -U BeautifulSoup docopt PyYAML pillow \
1818
sphinx sphinx_rtd_theme recommonmark
1919

20-
# cmake tends to hide and blur the dependencies between code modules, as
21-
# noted here https://github.com/PaddlePaddle/Paddle/issues/763. We are
22-
# thinking about using Bazel to fix this problem, e.g.,
23-
# https://github.com/PaddlePaddle/Paddle/issues/681#issuecomment-263996102. To
24-
# start the trail of fixing, we add Bazel to our Dockerfiles.
25-
RUN apt-get update && apt-get install -y curl software-properties-common \
26-
&& add-apt-repository ppa:webupd8team/java \
27-
&& echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections \
28-
&& echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
29-
&& curl https://bazel.build/bazel-release.pub.gpg | apt-key add - \
30-
&& apt-get update && apt-get install -y oracle-java8-installer bazel
31-
3220
ARG WITH_AVX
3321
ARG WITH_DOC
3422
ARG WITH_SWIG_PY

third_party/gflags.BUILD

Lines changed: 0 additions & 12 deletions
This file was deleted.

third_party/gflags_test/BUILD

Lines changed: 0 additions & 10 deletions
This file was deleted.

third_party/gflags_test/gflags_test.cc

Lines changed: 0 additions & 33 deletions
This file was deleted.

third_party/glog.BUILD

Lines changed: 0 additions & 128 deletions
This file was deleted.

third_party/glog_test/BUILD

Lines changed: 0 additions & 10 deletions
This file was deleted.

third_party/glog_test/glog_test.cc

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)