diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2018-05-23 22:41:00 +0200 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2018-05-23 22:41:00 +0200 |
commit | 629d621a3e167d09069fd2bec13f931cc898d074 (patch) | |
tree | 9dc959958c63ee95f36db38f70fd3d9306750eb8 /templates | |
parent | dd009359e3afb822f28c0a294db4ebf013ab8fe7 (diff) |
upgrade bazel to 0.13.1, introduce template
Diffstat (limited to 'templates')
-rw-r--r-- | templates/tools/dockerfile/bazel.include | 5 | ||||
-rw-r--r-- | templates/tools/dockerfile/test/bazel/Dockerfile.template | 36 | ||||
-rw-r--r-- | templates/tools/dockerfile/test/sanity/Dockerfile.template | 15 |
3 files changed, 42 insertions, 14 deletions
diff --git a/templates/tools/dockerfile/bazel.include b/templates/tools/dockerfile/bazel.include new file mode 100644 index 0000000000..2c0f3825fc --- /dev/null +++ b/templates/tools/dockerfile/bazel.include @@ -0,0 +1,5 @@ +#======================== +# Bazel installation +RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list +RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add - +RUN apt-get -y update && apt-get -y install bazel=0.13.1 && apt-get clean diff --git a/templates/tools/dockerfile/test/bazel/Dockerfile.template b/templates/tools/dockerfile/test/bazel/Dockerfile.template new file mode 100644 index 0000000000..8ef2f02e71 --- /dev/null +++ b/templates/tools/dockerfile/test/bazel/Dockerfile.template @@ -0,0 +1,36 @@ +%YAML 1.2 +--- | + # Copyright 2015 gRPC authors. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + FROM gcr.io/oss-fuzz-base/base-builder + + # Install basic packages and Bazel dependencies. + RUN apt-get update && apt-get install -y software-properties-common python-software-properties + RUN add-apt-repository ppa:webupd8team/java + RUN apt-get update && apt-get -y install ${'\\'} + autoconf ${'\\'} + build-essential ${'\\'} + curl ${'\\'} + libtool ${'\\'} + make ${'\\'} + openjdk-8-jdk ${'\\'} + vim + + <%include file="../../bazel.include"/> + + RUN mkdir -p /var/local/jenkins + + # Define the default command. + CMD ["bash"] diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 69bb7c4671..00b93b5367 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -38,21 +38,8 @@ RUN echo "deb http://http.debian.net/debian jessie-backports main" >> /etc/apt/sources.list RUN apt-get update RUN apt-get install -y -t jessie-backports openjdk-8-jdk - - #======================== - # Bazel installation - RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" > /etc/apt/sources.list.d/bazel.list - RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add - - RUN apt-get -y update - RUN apt-get -y install bazel - - # Pin Bazel to 0.9.0 - # Installing Bazel via apt-get first is required before installing 0.9.0 to - # allow gRPC to build without errors. See https://github.com/grpc/grpc/issues/10553 - RUN curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/0.9.0/bazel-0.9.0-installer-linux-x86_64.sh - RUN chmod +x ./bazel-0.9.0-installer-linux-x86_64.sh - RUN ./bazel-0.9.0-installer-linux-x86_64.sh + <%include file="../../bazel.include"/> <%include file="../../clang5.include"/> <%include file="../../run_tests_addons.include"/> |