Merge branch '3.1.x' into 3.2.x

Closes gh-39938

Author: scottfrederick

ci/images/get-docker-url.sh

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