Merge branch '2.5.x' into 2.6.x

Closes gh-30409

Author: wilkinsona

ci/pipeline.yml

@@ -94,6 +94,11 @@ anchors:
     docker-hub-mirror-username: ((docker-hub-mirror-username))
     docker-hub-mirror-password: ((docker-hub-mirror-password))
 resource_types:
+- name: registry-image
+  type: registry-image
+  source:
+    repository: concourse/registry-image-resource
+    tag: 1.5.0
 - name: artifactory-resource
   type: registry-image
   source: