Slightly different check-valid-until fix

templates/tools/dockerfile/cmake_jessie_backports.include

@@ -3,4 +3,5 @@
 # should only be used for images based on debian jessie.
 
 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean

test/distrib/cpp/run_distrib_test_cmake.sh

@@ -18,7 +18,8 @@ set -ex
 cd "$(dirname "$0")/../../.."
 
 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
+echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+apt-get update
 apt-get install -t jessie-backports -y libssl-dev
 
 # Install c-ares

test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh

@@ -18,7 +18,8 @@ set -ex
 cd "$(dirname "$0")/../../.."
 
 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
+echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+apt-get update
 apt-get install -t jessie-backports -y libssl-dev
 
 # To increase the confidence that gRPC installation works without depending on

tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile

@@ -30,6 +30,7 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y golang && 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
 
 CMD ["bash"]

tools/dockerfile/grpc_artifact_linux_x64/Dockerfile

@@ -73,7 +73,8 @@ RUN apt-get update && apt-get install -y \
 
 # Use cmake 3.6 from jessie-backports
 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
 
 RUN mkdir /var/local/jenkins
 

tools/dockerfile/grpc_artifact_linux_x86/Dockerfile

@@ -65,7 +65,8 @@ RUN /bin/bash -l -c "gem install bundler -v 1.17.3 --no-ri --no-rdoc"
 
 # Use cmake 3.6 from jessie-backports
 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
 
 RUN mkdir /var/local/jenkins
 

tools/dockerfile/test/cxx_jessie_x64/Dockerfile

@@ -77,7 +77,8 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c
 # should only be used for images based on debian jessie.
 
 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
 
 
 RUN mkdir /var/local/jenkins

tools/dockerfile/test/cxx_jessie_x86/Dockerfile

@@ -80,7 +80,8 @@ RUN mkdir /var/local/jenkins
 # should only be used for images based on debian jessie.
 
 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
 
 
 # Install gcc-4.8 and other relevant items

tools/dockerfile/test/fuzzer/Dockerfile

@@ -77,7 +77,8 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c
 # should only be used for images based on debian jessie.
 
 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
 
 #=================
 # Update clang to a version with improved tsan and fuzzing capabilities