Update fix with new information from post

pull/18530/head
murgatroid99 6 years ago
parent 084ebec9af
commit 93dc0d6ec3
  1. 4
      templates/tools/dockerfile/cmake_jessie_backports.include
  2. 4
      test/distrib/cpp/run_distrib_test_cmake.sh
  3. 4
      test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh
  4. 4
      tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
  5. 4
      tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
  6. 4
      tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
  7. 4
      tools/dockerfile/test/cxx_jessie_x64/Dockerfile
  8. 4
      tools/dockerfile/test/cxx_jessie_x86/Dockerfile
  9. 4
      tools/dockerfile/test/fuzzer/Dockerfile

@ -2,5 +2,5 @@
# Use cmake 3.6 from jessie-backports
# should only be used for images based on debian jessie.
RUN echo "deb [check-valid-until=no] http://archive.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 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -t jessie-backports -y cmake && apt-get clean

@ -17,8 +17,8 @@ set -ex
cd "$(dirname "$0")/../../.."
echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
apt-get update
echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
apt-get -o Acquire::Check-Valid-Until=false update
apt-get install -t jessie-backports -y libssl-dev
# Install c-ares

@ -17,8 +17,8 @@ set -ex
cd "$(dirname "$0")/../../.."
echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
apt-get update
echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
apt-get -o Acquire::Check-Valid-Until=false update
apt-get install -t jessie-backports -y libssl-dev
# To increase the confidence that gRPC installation works without depending on

@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y golang && apt-get clean
RUN echo "deb [check-valid-until=no] http://archive.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 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -t jessie-backports -y cmake && apt-get clean
CMD ["bash"]

@ -72,8 +72,8 @@ RUN apt-get update && apt-get install -y \
# C# dependencies (needed to build grpc_csharp_ext)
# Use cmake 3.6 from jessie-backports
RUN echo "deb [check-valid-until=no] http://archive.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 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -t jessie-backports -y cmake && apt-get clean
RUN mkdir /var/local/jenkins

@ -64,8 +64,8 @@ RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-ri --no-rdoc"
# C# dependencies (needed to build grpc_csharp_ext)
# Use cmake 3.6 from jessie-backports
RUN echo "deb [check-valid-until=no] http://archive.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 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -t jessie-backports -y cmake && apt-get clean
RUN mkdir /var/local/jenkins

@ -76,8 +76,8 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c
# Use cmake 3.6 from jessie-backports
# should only be used for images based on debian jessie.
RUN echo "deb [check-valid-until=no] http://archive.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 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -t jessie-backports -y cmake && apt-get clean
RUN mkdir /var/local/jenkins

@ -79,8 +79,8 @@ RUN mkdir /var/local/jenkins
# Use cmake 3.6 from jessie-backports
# should only be used for images based on debian jessie.
RUN echo "deb [check-valid-until=no] http://archive.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 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -t jessie-backports -y cmake && apt-get clean
# Install gcc-4.8 and other relevant items

@ -76,8 +76,8 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c
# Use cmake 3.6 from jessie-backports
# should only be used for images based on debian jessie.
RUN echo "deb [check-valid-until=no] http://archive.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 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -t jessie-backports -y cmake && apt-get clean
#=================
# Update clang to a version with improved tsan and fuzzing capabilities

Loading…
Cancel
Save