diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-12-20 17:15:39 +0100 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-12-22 10:54:25 +0100 |
| commit | 7dd2cc6f68714228cf8b4c60220f4532b3061d82 (patch) | |
| tree | 541c75facb35f5f935e7d95d2494b21961402a11 /templates/tools/dockerfile/test | |
| parent | 276f390480a4ecb90909e9ebd7ef581dea3d480a (diff) | |
cleanup and speedup of sanity tests
Diffstat (limited to 'templates/tools/dockerfile/test')
| -rw-r--r-- | templates/tools/dockerfile/test/sanity/Dockerfile.template | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 0168353933..8617666b21 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -52,18 +52,12 @@ # ./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 && \ + 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/ - #=================== - # Docker "inception" - # Note this is quite the ugly hack. - # This makes sure that the docker binary we inject has its dependencies. - RUN curl https://get.docker.com/ | sh - RUN apt-get remove --purge -y docker-engine - - RUN mkdir /var/local/jenkins + <%include file="../../clang_format.include"/> + <%include file="../../run_tests_addons.include"/> # Define the default command. CMD ["bash"] |