diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-05-21 17:55:36 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-05-21 17:55:36 +0200 |
| commit | 2751f01750c7d9cb2a515649b656bc9821c1452d (patch) | |
| tree | 902af8dcb2d06c419d1d6cf2d3379b625f8993ca /tools/dockerfile/test | |
| parent | 84729fef9e282caea9765c525c2f607d8529838f (diff) | |
regenerate 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 14b44b5655..4dda0f0b9e 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 f89c51586b..986cfcbada 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 .. |