diff --git a/paddle/scripts/docker/Dockerfile b/paddle/scripts/docker/Dockerfile
index 2a1a842336aa0409bba1315c77279ba2b018a4cd..edb84712d8a238ad84feb424246c6b44937601bf 100644
--- a/paddle/scripts/docker/Dockerfile
+++ b/paddle/scripts/docker/Dockerfile
@@ -1,6 +1,7 @@
 FROM ubuntu:14.04
 MAINTAINER PaddlePaddle Authors <paddle-dev@baidu.com>
 
+ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get install -y cmake libprotobuf-dev protobuf-compiler git \
     libgoogle-glog-dev libgflags-dev libatlas-dev libatlas3-base g++ m4 python-pip \
@@ -12,6 +13,18 @@ RUN apt-get update \
 RUN pip install -U BeautifulSoup docopt PyYAML pillow \
     sphinx sphinx_rtd_theme breathe recommonmark
 
+# cmake tends to hide and blur the dependencies between code modules, as
+# noted here https://github.com/PaddlePaddle/Paddle/issues/763. We are
+# thinking about using Bazel to fix this problem, e.g.,
+# https://github.com/PaddlePaddle/Paddle/issues/681#issuecomment-263996102. To
+# start the trail of fixing, we add Bazel to our Dockerfiles.
+RUN apt-get update && apt-get install -y curl software-properties-common \
+    && add-apt-repository ppa:webupd8team/java \
+    && echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections \
+    && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
+    && curl https://bazel.build/bazel-release.pub.gpg | apt-key add - \
+    && apt-get update && apt-get install -y oracle-java8-installer bazel
+
 ARG WITH_AVX
 ARG WITH_DOC
 ARG WITH_SWIG_PY
diff --git a/paddle/scripts/docker/Dockerfile.gpu b/paddle/scripts/docker/Dockerfile.gpu
index b3253d23c35811a68adc665df3d35998c09f9def..5d175e15a79f033e05c2e5c43350b2fde26e7107 100644
--- 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 Authors <paddle-dev@baidu.com>
 
+ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get install -y cmake libprotobuf-dev protobuf-compiler git \
     libgoogle-glog-dev libgflags-dev libatlas-dev libatlas3-base g++ m4 python-pip \
@@ -12,6 +13,18 @@ RUN apt-get update \
 RUN pip install -U BeautifulSoup docopt PyYAML pillow \
     sphinx sphinx_rtd_theme breathe recommonmark
 
+# cmake tends to hide and blur the dependencies between code modules, as
+# noted here https://github.com/PaddlePaddle/Paddle/issues/763. We are
+# thinking about using Bazel to fix this problem, e.g.,
+# https://github.com/PaddlePaddle/Paddle/issues/681#issuecomment-263996102. To
+# start the trail of fixing, we add Bazel to our Dockerfiles.
+RUN apt-get update && apt-get install -y curl software-properties-common \
+    && add-apt-repository ppa:webupd8team/java \
+    && echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections \
+    && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
+    && curl https://bazel.build/bazel-release.pub.gpg | apt-key add - \
+    && apt-get update && apt-get install -y oracle-java8-installer bazel
+
 ARG WITH_AVX
 ARG WITH_DOC
 ARG WITH_SWIG_PY