Merge branch '2.4.x' into 2.5.x

Closes gh-27053
2021-06-23 17:54:22 -07:00
parent a77e116c03 9415678acd
commit e9d3e0d022
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-20210416
+FROM ubuntu:focal-20210609

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

 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-20210416
+FROM ubuntu:focal-20210609

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