diff --git a/docker/tensorflow/Dockerfile b/docker/tensorflow/Dockerfile
index 2c6e0142fdd779e3d76916b42c7a645dcba081a7..6a230afefde0b808dc092d3e5d429124376c9908 100644
--- a/docker/tensorflow/Dockerfile
+++ b/docker/tensorflow/Dockerfile
@@ -52,14 +52,56 @@ WORKDIR /tensorflow
 ##################################################
 RUN pip install --upgrade numpy pandas matplotlib
 
+# Running bazel inside a `docker build` command causes trouble, cf:
+#   https://github.com/bazelbuild/bazel/issues/134
+# The easiest solution is to set up a bazelrc file forcing --batch.
+RUN echo "startup --batch" >>/etc/bazel.bazelrc
+# Similarly, we need to workaround sandboxing issues:
+#   https://github.com/bazelbuild/bazel/issues/418
+RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
+    >>/etc/bazel.bazelrc
+# Install the most recent bazel release.
+ENV BAZEL_VERSION 0.5.0
+WORKDIR /
+RUN mkdir /bazel && \
+    cd /bazel && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
+    chmod +x bazel-*.sh && \
+    ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    cd / && \
+    rm -f /bazel/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh
+
+# Download and build TensorFlow.
+
+RUN git clone https://github.com/tensorflow/tensorflow.git && \
+    cd tensorflow && \
+    git checkout r1.2
+WORKDIR /tensorflow
+
+# TODO(craigcitro): Don't install the pip package, since it makes it
+# more difficult to experiment with local changes. Instead, just add
+# the built directory to the path.
+
+ENV CI_BUILD_PYTHON python
+
+RUN tensorflow/tools/ci_build/builds/configured CPU \
+    bazel build -c opt --cxxopt="-D_GLIBCXX_USE_CXX11_ABI=0" \
+        tensorflow/tools/pip_package:build_pip_package && \
+    bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/pip && \
+    pip --no-cache-dir install --upgrade /tmp/pip/tensorflow-*.whl && \
+    rm -rf /tmp/pip && \
+    rm -rf /root/.cache
+# Clean up pip wheel and Bazel cache when done.
+
 # COMPILE AND INSTALL PIP PACKAGE
-COPY files/conf.txt /tmp/conf.txt
+#COPY files/conf.txt /tmp/conf.txt
 
-RUN ./configure < /tmp/conf.txt 
-RUN bazel build --config=opt //tensorflow/tools/pip_package:build_pip_package
-RUN pip install wheel
-RUN bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pkg
-RUN pip install /tmp/tensorflow_pkg/tensorflow-*.whl
+#RUN ./configure < /tmp/conf.txt 
+#RUN bazel build --config=opt //tensorflow/tools/pip_package:build_pip_package
+#RUN pip install wheel
+#RUN bazel-bin/tensorflow/tools/pip_package/build_pip_package /tmp/tensorflow_pkg
+#RUN pip install /tmp/tensorflow_pkg/tensorflow-*.whl
 
 ##################################################
 # GPy