diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-26 13:19:07 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-26 13:19:07 -0700 |
| commit | 92b3f568dbd1bf15c85cddac8d8f57a5a58201ef (patch) | |
| tree | 57cbb547c3e2feee2737df86382b422d37ebb3c0 /tools/dockerfile | |
| parent | c63a09eb6ceb547c73b674f48a5833412cd5f08f (diff) | |
| parent | 94f908ae84ab6d280a41e09245925ecfa612dce8 (diff) | |
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'tools/dockerfile')
| -rw-r--r-- | tools/dockerfile/grpc_clang_format/Dockerfile | 12 | ||||
| -rwxr-xr-x | tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/dockerfile/grpc_clang_format/Dockerfile b/tools/dockerfile/grpc_clang_format/Dockerfile index 4b101f6f53..be2ffc58cf 100644 --- a/tools/dockerfile/grpc_clang_format/Dockerfile +++ b/tools/dockerfile/grpc_clang_format/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -27,9 +27,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM ubuntu:vivid +FROM ubuntu:wily RUN apt-get update -RUN apt-get -y install clang-format-3.6 +RUN apt-get -y install wget +RUN echo deb http://llvm.org/apt/wily/ llvm-toolchain-wily main >> /etc/apt/sources.list +RUN echo deb-src http://llvm.org/apt/wily/ llvm-toolchain-wily main >> /etc/apt/sources.list +RUN wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key| apt-key add - +RUN apt-get update +RUN apt-get -y install clang-format-3.8 ADD clang_format_all_the_things.sh / CMD ["echo 'Run with tools/distrib/clang_format_code.sh'"] - diff --git a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh index d56bc01831..a50ca17411 100755 --- a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh +++ b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh @@ -37,7 +37,7 @@ DIRS="src/core src/cpp test/core test/cpp include" GLOB="*.h *.c *.cc" # clang format command -CLANG_FORMAT=clang-format-3.6 +CLANG_FORMAT=clang-format-3.8 files= for dir in $DIRS |