diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-05-21 13:35:12 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-21 13:35:12 -0700 |
| commit | 2b511dc9c489f65db386c7fe7a81c28770c91767 (patch) | |
| tree | 6f2826ddee7bb6bb9a3d290aced823c46896a9ca /templates/tools | |
| parent | c50f1664893753f2ce455c66228c27f7840a9da0 (diff) | |
| parent | 07bbdde4ae7e61454bfb1024e6101e1d991abc5d (diff) | |
Merge pull request #15481 from jtattermusch/upgrade_cmake
Upgrade cmake in C++ dockerfiles
Diffstat (limited to 'templates/tools')
4 files changed, 8 insertions, 2 deletions
diff --git a/templates/tools/dockerfile/clang_update.include b/templates/tools/dockerfile/clang_update.include index 4f827c8dc2..279bb4cf6b 100644 --- a/templates/tools/dockerfile/clang_update.include +++ b/templates/tools/dockerfile/clang_update.include @@ -1,8 +1,6 @@ #================= # Update clang to a version with improved tsan and fuzzing capabilities -RUN apt-get update && apt-get -y install python cmake && apt-get clean - RUN git clone -n -b release_38 http://llvm.org/git/llvm.git && ${'\\'} cd llvm && git checkout ad57503 && cd .. RUN git clone -n -b release_38 http://llvm.org/git/clang.git && ${'\\'} diff --git a/templates/tools/dockerfile/cmake_jessie_backports.include b/templates/tools/dockerfile/cmake_jessie_backports.include new file mode 100644 index 0000000000..2fc49dc8d6 --- /dev/null +++ b/templates/tools/dockerfile/cmake_jessie_backports.include @@ -0,0 +1,6 @@ +#================= +# Use cmake 3.6 from jessie-backports +# should only be used for images based on debian jessie. + +RUN echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list +RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean diff --git a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template index 1226c19516..9d559dfafa 100644 --- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template @@ -20,6 +20,7 @@ <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> <%include file="../../cxx_deps.include"/> + <%include file="../../cmake_jessie_backports.include"/> <%include file="../../clang_update.include"/> <%include file="../../run_tests_addons.include"/> <%include file="../../libuv_install.include"/> diff --git a/templates/tools/dockerfile/test/fuzzer/Dockerfile.template b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template index 759b128c13..6dcd7b77de 100644 --- a/templates/tools/dockerfile/test/fuzzer/Dockerfile.template +++ b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template @@ -20,6 +20,7 @@ <%include file="../../gcp_api_libraries.include"/> <%include file="../../python_deps.include"/> <%include file="../../cxx_deps.include"/> + <%include file="../../cmake_jessie_backports.include"/> <%include file="../../clang_update.include"/> <%include file="../../run_tests_addons.include"/> RUN clang++ -c -g -O2 -std=c++11 llvm/lib/Fuzzer/*.cpp -IFuzzer |