From 4647230fe7915ec3718a5ee6515f540a5bd9eb5f Mon Sep 17 00:00:00 2001
From: Kiril Gorovoy <kgorovoy@google.com>
Date: Fri, 2 Sep 2016 12:52:11 -0800
Subject: [PATCH] Require Bazel 0.3.0 and update documentation and dockerfile
 accordingly. We technically need >=0.2.2 already to resolve runfiles paths
 correctly, and now TensorFlow requires 0.3.0, so updating our requirement as
 well. Change: 132099802

---
 WORKSPACE                                        | 4 ++++
 tensorflow_serving/g3doc/setup.md                | 8 ++++----
 tensorflow_serving/tools/docker/Dockerfile.devel | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 73cc1f75944..5a7e12f68ad 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,3 +3,7 @@ workspace(name = "tf_serving")
 # Please add all new TensorFlow Serving dependencies in workspace.bzl.
 load('//tensorflow_serving:workspace.bzl', 'tf_serving_workspace')
 tf_serving_workspace(__workspace_dir__)
+
+# Specify the minimum required bazel version.
+load("@org_tensorflow//tensorflow:tensorflow.bzl", "check_version")
+check_version("0.3.0")
\ No newline at end of file
diff --git a/tensorflow_serving/g3doc/setup.md b/tensorflow_serving/g3doc/setup.md
index e35a26df0ed..10a252a61ed 100644
--- a/tensorflow_serving/g3doc/setup.md
+++ b/tensorflow_serving/g3doc/setup.md
@@ -6,7 +6,7 @@ To compile and use TensorFlow Serving, you need to set up some prerequisites.
 
 ### Bazel
 
-TensorFlow Serving requires Bazel 0.2.0 or higher. You can find the Bazel
+TensorFlow Serving requires Bazel 0.3.0 or higher. You can find the Bazel
 installation instructions [here](http://bazel.io/docs/install.html).
 
 If you have the prerequisites for Bazel, those instructions consist of the
@@ -14,13 +14,13 @@ following steps:
 
 1.  Download the relevant binary from
     [here](https://github.com/bazelbuild/bazel/releases).
-    Let's say you downloaded bazel-0.2.0-installer-linux-x86_64.sh. You would
+    Let's say you downloaded bazel-0.3.0-installer-linux-x86_64.sh. You would
     execute:
 
     ~~~shell
     cd ~/Downloads
-    chmod +x bazel-0.2.0-installer-linux-x86_64.sh
-    ./bazel-0.2.0-installer-linux-x86_64.sh --user
+    chmod +x bazel-0.3.0-installer-linux-x86_64.sh
+    ./bazel-0.3.0-installer-linux-x86_64.sh --user
     ~~~
 2.  Set up your environment. Put this in your ~/.bashrc.
 
diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel b/tensorflow_serving/tools/docker/Dockerfile.devel
index 4880a799153..bce69208c77 100644
--- a/tensorflow_serving/tools/docker/Dockerfile.devel
+++ b/tensorflow_serving/tools/docker/Dockerfile.devel
@@ -56,7 +56,7 @@ RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
     >>/root/.bazelrc
 ENV BAZELRC /root/.bazelrc
 # Install the most recent bazel release.
-ENV BAZEL_VERSION 0.2.0
+ENV BAZEL_VERSION 0.3.0
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \