diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-12-05 12:18:41 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-12-05 12:18:41 -0800 |
| commit | f1c85b0e752ecc5894ddd766cdea162defc8b352 (patch) | |
| tree | d7c5b3d4b7ce419cea108f63b832eaf060f3b0cb /templates/tools/dockerfile/test/sanity/Dockerfile.template | |
| parent | da29be5ecef07781ef2cfa743300f971df05af76 (diff) | |
| parent | 032ca47012f23aecc7c7bf7f1cc9d998145119d9 (diff) | |
Merge branch 'master' into node_electron_build
Diffstat (limited to 'templates/tools/dockerfile/test/sanity/Dockerfile.template')
| -rw-r--r-- | templates/tools/dockerfile/test/sanity/Dockerfile.template | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 12309b64d1..0168353933 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -48,9 +48,12 @@ #====================================== # More sanity test dependencies (bazel) RUN apt-get install -y openjdk-8-jdk - # TOOD(jtattermusch): pin the bazel version - RUN git clone https://github.com/bazelbuild/bazel.git /bazel - RUN cd /bazel && ./compile.sh + # Check out Bazel version 0.4.1 since this version allows running + # ./compile.sh without a local protoc dependency + # TODO(mattkwong): install dependencies to support latest Bazel version if newer + # version is needed + RUN git clone https://github.com/bazelbuild/bazel.git /bazel && \ + cd /bazel && git checkout tags/0.4.1 && ./compile.sh RUN ln -s /bazel/output/bazel /bin/ #=================== |