From 84729fef9e282caea9765c525c2f607d8529838f Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 21 May 2018 17:55:06 +0200 Subject: [PATCH 1/3] use cmake from jessie backports --- templates/tools/dockerfile/clang_update.include | 2 -- templates/tools/dockerfile/cmake_jessie_backports.include | 6 ++++++ .../dockerfile/test/cxx_jessie_x64/Dockerfile.template | 1 + templates/tools/dockerfile/test/fuzzer/Dockerfile.template | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 templates/tools/dockerfile/cmake_jessie_backports.include diff --git a/templates/tools/dockerfile/clang_update.include b/templates/tools/dockerfile/clang_update.include index 4f827c8dc21..279bb4cf6bf 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 00000000000..2fc49dc8d60 --- /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 1226c195163..9d559dfafad 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 759b128c13e..6dcd7b77dec 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 From 2751f01750c7d9cb2a515649b656bc9821c1452d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 21 May 2018 17:55:36 +0200 Subject: [PATCH 2/3] regenerate dockerfiles --- tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 9 +++++++-- 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 14b44b56553..4dda0f0b9e3 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 f89c51586b2..986cfcbada5 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 .. From 07bbdde4ae7e61454bfb1024e6101e1d991abc5d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 21 May 2018 17:57:28 +0200 Subject: [PATCH 3/3] upgrade cmake in C++ distribtest dockerfile --- tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile b/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile index 0e8186d40ce..894f114951c 100644 --- a/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile +++ b/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile @@ -27,6 +27,9 @@ RUN apt-get update && apt-get install -y \ pkg-config \ unzip && apt-get clean -RUN apt-get update && apt-get install -y cmake golang && apt-get clean +RUN apt-get update && apt-get install -y golang && apt-get clean + +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 CMD ["bash"]