Fix other docker build issues

2019-03-28 15:56:08 -07:00 · 2019-03-28 15:56:08 -07:00 · 2a12b47f0b
parent 961f25bd27
commit 2a12b47f0b
45 changed files with 79 additions and 21 deletions
--- a/templates/tools/dockerfile/cmake_jessie_backports.include
+++ b/templates/tools/dockerfile/cmake_jessie_backports.include
@ -4,4 +4,5 @@

 RUN echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
 RUN echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean
--- a/templates/tools/dockerfile/debian_jessie_header.include
+++ b/templates/tools/dockerfile/debian_jessie_header.include
@ -0,0 +1,2 @@
+FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
--- a/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template
+++ b/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../debian_jessie_header.include"/>
  
  <%include file="../clang5.include"/>
  ADD clang_format_all_the_things.sh /
--- a/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template
+++ b/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../debian_jessie_header.include"/>
  
  <%include file="../clang5.include"/>
  <%include file="../python_deps.include"/>
--- a/templates/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../apt_get_basic.include"/>
  <%include file="../../python_deps.include"/>
--- a/templates/tools/dockerfile/interoptest/grpc_interop_java_oracle8/Dockerfile.include
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_java_oracle8/Dockerfile.include
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM debian:jessie
+<%include file="../../debian_jessie_header.include"/>

 <%include file="java_deps.include"/>
 <%include file="../../python_deps.include"/>
--- a/templates/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../apt_get_basic.include"/>
  <%include file="../../python_deps.include"/>
--- a/templates/tools/dockerfile/interoptest/grpc_interop_nodepurejs/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_nodepurejs/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.

-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>

  <%include file="../../apt_get_basic.include"/>
  <%include file="../../node_deps.include"/>
--- a/templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../apt_get_basic.include"/>
  <%include file="../../php_deps.include"/>
--- a/templates/tools/dockerfile/interoptest/grpc_interop_php7/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_php7/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../php7_deps.include"/>
  <%include file="../../run_tests_addons.include"/>
--- a/templates/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../apt_get_basic.include"/>
  <%include file="../../python_deps.include"/>
--- a/templates/tools/dockerfile/ruby_deps.include
+++ b/templates/tools/dockerfile/ruby_deps.include
@ -2,7 +2,8 @@
 # Ruby dependencies

 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN apt-get update && apt-get install -y gnupg2
+RUN gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable

 # Install Ruby 2.5
--- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.

-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>

  <%include file="../../apt_get_basic.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template
@ -15,6 +15,7 @@
  # limitations under the License.
  
  FROM 32bit/debian:jessie
+  RUN sed -i '/deb http:\/\/http.debian.net\/debian jessie-updates main/d' /etc/apt/sources.list
  
  <%include file="../../apt_get_basic.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile.template
@ -16,6 +16,7 @@

  # This is the base Docker image we use for running tests on RBE
  FROM gcr.io/cloud-marketplace/google/rbe-debian8@sha256:1ede2a929b44d629ec5abe86eee6d7ffea1d5a4d247489a8867d46cfde3e38bd
+  RUN sed -i '/deb http:\/\/httpredir.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list

  <%include file="../../apt_get_basic.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/templates/tools/dockerfile/test/fuzzer/Dockerfile.template
+++ b/templates/tools/dockerfile/test/fuzzer/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.

-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>

  <%include file="../../apt_get_basic.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.

-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>

  <%include file="../../apt_get_basic.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../php7_deps.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../apt_get_basic.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../apt_get_basic.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:jessie
+  <%include file="../../debian_jessie_header.include"/>
  
  <%include file="../../apt_get_basic.include"/>
  <%include file="../../gcp_api_libraries.include"/>
--- a/test/distrib/cpp/run_distrib_test_cmake.sh
+++ b/test/distrib/cpp/run_distrib_test_cmake.sh
@ -19,6 +19,7 @@ cd "$(dirname "$0")/../../.."

 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 apt-get update
 apt-get install -t jessie-backports -y libssl-dev

--- a/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh
+++ b/test/distrib/cpp/run_distrib_test_cmake_as_externalproject.sh
@ -19,6 +19,7 @@ cd "$(dirname "$0")/../../.."

 echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 apt-get update
 apt-get install -t jessie-backports -y libssl-dev

--- a/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
@ -13,6 +13,7 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list

 # Install packages needed for gRPC and protobuf
 RUN apt-get update && apt-get install -y \
@ -31,6 +32,7 @@ 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean

 CMD ["bash"]
--- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile
@ -15,6 +15,7 @@
 # Docker file for building gRPC artifacts.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
@ -49,7 +50,8 @@ RUN apt-get update && apt-get install -y \
 # Ruby dependencies

 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN apt-get update && apt-get install -y gnupg2
+RUN gpg --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable

 # Install Ruby 2.1
@ -74,6 +76,7 @@ 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean

 RUN mkdir /var/local/jenkins
--- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
+++ b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile
@ -15,6 +15,7 @@
 # Docker file for building gRPC artifacts.

 FROM 32bit/debian:jessie
+RUN sed -i '/deb http:\/\/http.debian.net\/debian jessie-updates main/d' /etc/apt/sources.list

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
@ -49,7 +50,9 @@ RUN apt-get update && apt-get install -y \
 # Ruby dependencies

 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+# Install rvm
+RUN apt-get update && apt-get install -y gnupg2
+RUN gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable

 # Install Ruby 2.1
@ -66,6 +69,7 @@ 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 echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean

 RUN mkdir /var/local/jenkins
--- a/tools/dockerfile/grpc_clang_format/Dockerfile
+++ b/tools/dockerfile/grpc_clang_format/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 RUN apt-get update && apt-get -y install wget xz-utils
 RUN wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz
--- a/tools/dockerfile/grpc_clang_tidy/Dockerfile
+++ b/tools/dockerfile/grpc_clang_tidy/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 RUN apt-get update && apt-get -y install wget xz-utils
 RUN wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz
--- a/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_cxx/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
--- a/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_java/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install JDK 8 and Git
 #
--- a/tools/dockerfile/interoptest/grpc_interop_java_oracle8/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_java_oracle8/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install JDK 8 and Git
 #
--- a/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_node/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
--- a/tools/dockerfile/interoptest/grpc_interop_nodepurejs/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_nodepurejs/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
--- a/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
--- a/tools/dockerfile/interoptest/grpc_interop_php7/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_php7/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 #=================
 # PHP7 dependencies
--- a/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_ruby/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
@ -68,7 +70,8 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
 # Ruby dependencies

 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN apt-get update && apt-get install -y gnupg2
+RUN gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable

 # Install Ruby 2.5
--- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
@ -78,6 +80,7 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c

 RUN echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
 RUN echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean


--- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile
+++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile
@ -13,6 +13,7 @@
 # limitations under the License.

 FROM 32bit/debian:jessie
+RUN sed -i '/deb http:\/\/http.debian.net\/debian jessie-updates main/d' /etc/apt/sources.list

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
@ -81,6 +82,7 @@ RUN mkdir /var/local/jenkins

 RUN echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
 RUN echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean


--- a/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/cxx_sanitizers_jessie_x64/Dockerfile
@ -14,6 +14,7 @@

 # This is the base Docker image we use for running tests on RBE
 FROM gcr.io/cloud-marketplace/google/rbe-debian8@sha256:1ede2a929b44d629ec5abe86eee6d7ffea1d5a4d247489a8867d46cfde3e38bd
+RUN sed -i '/deb http:\/\/httpredir.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
--- a/tools/dockerfile/test/fuzzer/Dockerfile
+++ b/tools/dockerfile/test/fuzzer/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
@ -78,6 +80,7 @@ RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev c

 RUN echo "deb http://archive.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
 RUN echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
 RUN apt-get update && apt-get install -t jessie-backports -y cmake && apt-get clean

 #=================
--- a/tools/dockerfile/test/node_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
--- a/tools/dockerfile/test/php7_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/php7_jessie_x64/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 #=================
 # PHP7 dependencies
--- a/tools/dockerfile/test/php_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/php_jessie_x64/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
--- a/tools/dockerfile/test/python_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
--- a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile
+++ b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile
@ -13,6 +13,8 @@
 # limitations under the License.

 FROM debian:jessie
+RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+

 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \
@ -72,7 +74,8 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
 # Ruby dependencies

 # Install rvm
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN apt-get update && apt-get install -y gnupg2
+RUN gpg2 --keyserver hkp://pool.sks-keyservers.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 RUN \curl -sSL https://get.rvm.io | bash -s stable

 # Install Ruby 2.5