diff options
| author |  matt-kwong <mattkwong@google.com> | 2016-12-02 11:55:15 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-12-02 11:55:15 -0800 |
| commit | e633e474941e6e52e6c3d26fa1fa657019647360 (patch) | |
| tree | 53eae4fcf4a44faa9c745c7150d38fa425497ec1 | |
| parent | 8442ebee032d5520520eb669b826332d15fa3d04 (diff) | |
| parent | 180ea4bb204d9ed4d5abf3aee41649ebbc7f678c (diff) | |
Merge pull request #8906 from matt-kwong/pin-bazel-version
Pin bazel version to 0.4.1 release tag
| -rw-r--r-- | templates/tools/dockerfile/test/sanity/Dockerfile.template | 9 | ||||
| -rw-r--r-- | tools/dockerfile/test/sanity/Dockerfile | 8 |
2 files changed, 11 insertions, 6 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/ #=================== diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index f4b4831a64..6b19ac845b 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -93,9 +93,11 @@ RUN pip install simplejson mako #====================================== # 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/ #=================== |