Merge pull request #17798 from lidizheng/bazel-install

Install Bazel using its installation script
pull/17904/head
Lidi Zheng 6 years ago committed by GitHub
commit 15bb25ae54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      templates/tools/dockerfile/bazel.include
  2. 1
      templates/tools/dockerfile/test/sanity/Dockerfile.template
  3. 5
      tools/dockerfile/test/bazel/Dockerfile
  4. 8
      tools/dockerfile/test/sanity/Dockerfile

@ -2,5 +2,6 @@
# Bazel installation
RUN apt-get update && apt-get install -y wget && apt-get clean
RUN wget -q https://github.com/bazelbuild/bazel/releases/download/0.17.1/bazel-0.17.1-linux-x86_64 -O /usr/local/bin/bazel
RUN chmod 755 /usr/local/bin/bazel
RUN wget https://github.com/bazelbuild/bazel/releases/download/0.20.0/bazel-0.20.0-installer-linux-x86_64.sh && ${'\\'}
bash ./bazel-0.20.0-installer-linux-x86_64.sh && ${'\\'}
rm bazel-0.20.0-installer-linux-x86_64.sh

@ -32,6 +32,7 @@
RUN python3 -m pip install simplejson mako virtualenv lxml
<%include file="../../clang5.include"/>
<%include file="../../bazel.include"/>
# Define the default command.
CMD ["bash"]

@ -52,8 +52,9 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
# Bazel installation
RUN apt-get update && apt-get install -y wget && apt-get clean
RUN wget -q https://github.com/bazelbuild/bazel/releases/download/0.17.1/bazel-0.17.1-linux-x86_64 -O /usr/local/bin/bazel
RUN chmod 755 /usr/local/bin/bazel
RUN wget https://github.com/bazelbuild/bazel/releases/download/0.20.0/bazel-0.20.0-installer-linux-x86_64.sh && \
bash ./bazel-0.20.0-installer-linux-x86_64.sh && \
rm bazel-0.20.0-installer-linux-x86_64.sh
RUN mkdir -p /var/local/jenkins

@ -94,6 +94,14 @@ ENV CLANG_FORMAT=clang-format
RUN ln -s /clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang-tidy /usr/local/bin/clang-tidy
ENV CLANG_TIDY=clang-tidy
#========================
# Bazel installation
RUN apt-get update && apt-get install -y wget && apt-get clean
RUN wget https://github.com/bazelbuild/bazel/releases/download/0.20.0/bazel-0.20.0-installer-linux-x86_64.sh && \
bash ./bazel-0.20.0-installer-linux-x86_64.sh && \
rm bazel-0.20.0-installer-linux-x86_64.sh
# Define the default command.
CMD ["bash"]

Loading…
Cancel
Save