Merge branch '2.1.x' into 2.2.x

Closes gh-23943
2020-10-28 19:30:35 -07:00 · 2020-10-28 19:30:35 -07:00 · 719d71e31b
parent cf7e16e134 327181455c
commit 719d71e31b
3 changed files with 3 additions and 3 deletions
--- a/ci/images/ci-image-jdk11/Dockerfile
+++ b/ci/images/ci-image-jdk11/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:focal-20200925
+FROM ubuntu:focal-20201008

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
--- a/ci/images/ci-image-jdk15/Dockerfile
+++ b/ci/images/ci-image-jdk15/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:focal-20200925
+FROM ubuntu:focal-20201008

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:focal-20200925
+FROM ubuntu:focal-20201008

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh