Merge branch '2.5.x' into 2.6.x

Closes gh-30999

Author: wilkinsona

ci/tasks/build-ci-image.yml

@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: concourse/oci-build-task
-    tag: 0.9.1
+    tag: 0.10.0
     registry_mirror:
       host: ((docker-hub-mirror))
       username: ((docker-hub-mirror-username))