diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2019-06-05 16:53:12 -0400 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2019-06-05 16:53:12 -0400 |
| commit | e66fb82495da076607eb27cc940714748d870762 (patch) | |
| tree | e2c7bbf7f1332504ca91e88507567b5937b5293c /tools | |
| parent | f13727dfd110b7e1c95d24acf607d08ca44c4a35 (diff) | |
| download | grpc-grpc-e66fb82495da076607eb27cc940714748d870762.tar.gz | |
disable bazel wrapper inside docker containers
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/test/bazel/Dockerfile | 3 | ||||
| -rw-r--r-- | tools/dockerfile/test/sanity/Dockerfile | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/dockerfile/test/bazel/Dockerfile b/tools/dockerfile/test/bazel/Dockerfile index 0e958542f9..df7a7a2f32 100644 --- a/tools/dockerfile/test/bazel/Dockerfile +++ b/tools/dockerfile/test/bazel/Dockerfile @@ -54,6 +54,9 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t # Must be in sync with tools/bazel ENV BAZEL_VERSION 0.24.1 +# The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper. +ENV DISABLE_BAZEL_WRAPPER 1 + RUN apt-get update && apt-get install -y wget && apt-get clean RUN wget "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh" && \ bash ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \ diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 18aa89d8bf..9a080d0efb 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -100,6 +100,9 @@ ENV CLANG_TIDY=clang-tidy # Must be in sync with tools/bazel ENV BAZEL_VERSION 0.24.1 +# The correct bazel version is already preinstalled, no need to use //tools/bazel wrapper. +ENV DISABLE_BAZEL_WRAPPER 1 + RUN apt-get update && apt-get install -y wget && apt-get clean RUN wget "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh" && \ bash ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \ |