Merge branch '2.2.x' into 2.3.x

Author: philwebb

ci/tasks/build-ci-image.yml

@@ -13,7 +13,6 @@ caches:
 params:
   CONTEXT: ci-images-git-repo/ci/images
   DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
-  REGISTRY_MIRRORS: ((docker-hub-mirror))
   DOCKER_HUB_AUTH: ((docker-hub-auth))
 run:
   path: /bin/sh