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 /tools/dockerfile/test | |
| parent | c50f1664893753f2ce455c66228c27f7840a9da0 (diff) | |
| parent | 07bbdde4ae7e61454bfb1024e6101e1d991abc5d (diff) | |
Merge pull request #15481 from jtattermusch/upgrade_cmake
Upgrade cmake in C++ dockerfiles
Diffstat (limited to 'tools/dockerfile/test')
| -rw-r--r-- | tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 9 | ||||
| -rw-r--r-- | tools/dockerfile/test/fuzzer/Dockerfile | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index f2517539b6..08efcde5ed 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -73,9 +73,14 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean #================= -# Update clang to a version with improved tsan and fuzzing capabilities +# 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 -RUN apt-get update && apt-get -y install python cmake && apt-get clean +#================= +# Update clang to a version with improved tsan and fuzzing capabilities RUN git clone -n -b release_38 http://llvm.org/git/llvm.git && \ cd llvm && git checkout ad57503 && cd .. diff --git a/tools/dockerfile/test/fuzzer/Dockerfile b/tools/dockerfile/test/fuzzer/Dockerfile index a242492318..b53feedfae 100644 --- a/tools/dockerfile/test/fuzzer/Dockerfile +++ b/tools/dockerfile/test/fuzzer/Dockerfile @@ -73,9 +73,14 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean #================= -# Update clang to a version with improved tsan and fuzzing capabilities +# 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 -RUN apt-get update && apt-get -y install python cmake && apt-get clean +#================= +# Update clang to a version with improved tsan and fuzzing capabilities RUN git clone -n -b release_38 http://llvm.org/git/llvm.git && \ cd llvm && git checkout ad57503 && cd .. |