Merge branch '2.7.x' into 3.0.x

Closes gh-34214

Author: scottfrederick

ci/images/get-docker-url.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
 
-version="23.0.0"
+version="23.0.1"
 echo "https://download.docker.com/linux/static/stable/x86_64/docker-$version.tgz";