From 41aeb0758566ad5815c4881975c7a54fd83dc75d Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Thu, 2 Feb 2023 20:56:50 +0100
Subject: [PATCH] Rely only on Docker Hub for fetching OCI images

---
 ci/parameters.yml           |  3 ---
 ci/pipeline.yml             | 14 ++++++++------
 ci/tasks/build-ci-image.yml |  6 ++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ci/parameters.yml b/ci/parameters.yml
index 74f41d365c9..92880e75b11 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -8,7 +8,4 @@ milestone: "6.0.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
-registry-mirror-host: docker.repo.spring.io
-registry-mirror-username: ((artifactory-username))
-registry-mirror-password: ((artifactory-password))
 task-timeout: 1h00m
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 2822ab48eae..20d3026a745 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -23,11 +23,6 @@ anchors:
   docker-resource-source: &docker-resource-source
     username: ((docker-hub-username))
     password: ((docker-hub-password))
-    tag: ((milestone))
-  registry-mirror-vars: &registry-mirror-vars
-    registry-mirror-host: ((registry-mirror-host))
-    registry-mirror-username: ((registry-mirror-username))
-    registry-mirror-password: ((registry-mirror-password))
   slack-fail-params: &slack-fail-params
     text: >
       :concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
@@ -48,31 +43,37 @@ resource_types:
 - name: registry-image
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: concourse/registry-image-resource
     tag: 1.5.0
 - name: artifactory-resource
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: springio/artifactory-resource
     tag: 0.0.17
 - name: github-release
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: concourse/github-release-resource
     tag: 1.5.5
 - name: github-status-resource
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: dpb587/github-status-resource
     tag: master
 - name: pull-request
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: teliaoss/github-pr-resource
     tag: v0.23.0
 - name: slack-notification
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: cfcommunity/slack-notification-resource
     tag: latest
 resources:
@@ -94,6 +95,7 @@ resources:
   source:
     <<: *docker-resource-source
     repository: ((docker-hub-organization))/spring-framework-ci
+    tag: ((milestone))
 - name: every-morning
   type: time
   icon: alarm
@@ -168,7 +170,7 @@ jobs:
         image: ci-image
       vars:
         ci-image-name: ci-image
-        <<: *registry-mirror-vars
+        <<: *docker-resource-source
     - put: ci-image
       params:
         image: ci-image/image.tar
diff --git a/ci/tasks/build-ci-image.yml b/ci/tasks/build-ci-image.yml
index db0ad5d0517..28afb97cb62 100644
--- a/ci/tasks/build-ci-image.yml
+++ b/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: ((registry-mirror-host))
-      username: ((registry-mirror-username))
-      password: ((registry-mirror-password))
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
   - name: ci-images-git-repo
 outputs: