Merge branch '2.7.x' into 3.0.x

Author: philwebb

ci/pipeline.yml

@@ -11,8 +11,6 @@ anchors:
     username: ((docker-hub-username))
     password: ((docker-hub-password))
     tag: ((milestone))
-    registry_mirror:
-      host: ((docker-hub-mirror))
   gradle-enterprise-task-params: &gradle-enterprise-task-params
     GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
     GRADLE_ENTERPRISE_CACHE_URL: ((gradle_enterprise_cache_url))
@@ -95,8 +93,6 @@ anchors:
   gradle-publish-params: &gradle-publish-params
     GRADLE_PUBLISH_KEY: ((gradle-publish-key))
     GRADLE_PUBLISH_SECRET: ((gradle-publish-secret))
-  docker-hub-mirror-vars: &docker-hub-mirror-vars
-    docker-hub-mirror: ((docker-hub-mirror))
 resource_types:
 - name: registry-image
   type: registry-image
@@ -259,15 +255,13 @@ jobs:
         image: ci-image
       vars:
         ci-image-name: ci-image
-        <<: *docker-hub-mirror-vars
     - task: build-ci-image-jdk19
       privileged: true
       file: git-repo/ci/tasks/build-ci-image.yml
       output_mapping:
         image: ci-image-jdk19
       vars:
         ci-image-name: ci-image-jdk19
-        <<: *docker-hub-mirror-vars
   - in_parallel:
     - put: ci-image
       params:
@@ -528,8 +522,6 @@ jobs:
       RELEASE_TYPE: M
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
-    vars:
-      <<: *docker-hub-mirror-vars
   - put: github-pre-release
     params:
       name: generated-changelog/tag
@@ -559,8 +551,6 @@ jobs:
       RELEASE_TYPE: RC
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
-    vars:
-      <<: *docker-hub-mirror-vars
   - put: github-pre-release
     params:
       name: generated-changelog/tag
@@ -620,8 +610,6 @@ jobs:
       RELEASE_TYPE: RELEASE
       GITHUB_USERNAME: ((github-username))
       GITHUB_TOKEN: ((github-ci-release-token))
-    vars:
-      <<: *docker-hub-mirror-vars
   - put: github-release
     params:
       name: generated-changelog/tag

ci/tasks/build-ci-image.yml

@@ -5,10 +5,8 @@ image_resource:
   source:
     repository: concourse/oci-build-task
     tag: 0.10.0
-    registry_mirror:
-      host: ((docker-hub-mirror))
-      username: ((docker-hub-mirror-username))
-      password: ((docker-hub-mirror-password))
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
 - name: ci-images-git-repo
 outputs:

ci/tasks/generate-changelog.yml

@@ -5,10 +5,8 @@ image_resource:
   source:
     repository: springio/github-changelog-generator
     tag: '0.0.8'
-    registry_mirror:
-      host: ((docker-hub-mirror))
-      username: ((docker-hub-mirror-username))
-      password: ((docker-hub-mirror-password))
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
 - name: git-repo
 - name: artifactory-repo