From bcd6bad54abda5deb86f4a32dc2f7e39d54423f6 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Tue, 14 Feb 2023 10:10:41 +0100
Subject: [PATCH] Consistently use Docker creds for fetching images

---
 ci/pipeline.yml                 | 23 +++++++++--------------
 ci/tasks/generate-changelog.yml |  8 +++-----
 ci/tasks/promote-version.yml    |  2 ++
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 9ebf52fd..d07176e5 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -13,10 +13,6 @@ anchors:
     ARTIFACTORY_SERVER: ((artifactory-server))
     ARTIFACTORY_USERNAME: ((artifactory-username))
     ARTIFACTORY_PASSWORD: ((artifactory-password))
-  registry-mirror-vars: &registry-mirror-vars
-    registry-mirror-host: ((registry-mirror-host))
-    registry-mirror-username: ((registry-mirror-username))
-    registry-mirror-password: ((registry-mirror-password))
   sonatype-task-params: &sonatype-task-params
     SONATYPE_USERNAME: ((sonatype-username))
     SONATYPE_PASSWORD: ((sonatype-password))
@@ -35,7 +31,7 @@ resource_types:
   source:
     <<: *registry-image-resource-source
     repository: springio/artifactory-resource
-    tag: 0.0.17
+    tag: 0.0.18
 - name: github-release
   type: registry-image
   source:
@@ -63,8 +59,7 @@ resources:
   type: registry-image
   icon: docker
   source:
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
+    <<: *registry-image-resource-source
     tag: ((milestone))
     repository: ((docker-hub-organization))/spring-graphql-ci-image
 - name: artifactory-repo
@@ -106,7 +101,7 @@ jobs:
       image: ci-image
     vars:
       ci-image-name: ci-image
-      <<: *registry-mirror-vars
+      <<: *registry-image-resource-source
   - put: ci-image
     params:
       image: ci-image/image.tar
@@ -183,7 +178,7 @@ jobs:
       params:
         RELEASE_TYPE: M
         <<: *artifactory-task-params
-        <<: *registry-mirror-vars
+        <<: *registry-image-resource-source
     - task: generate-changelog
       file: git-repo/ci/tasks/generate-changelog.yml
       params:
@@ -191,7 +186,7 @@ jobs:
         GITHUB_USERNAME: ((github-username))
         GITHUB_TOKEN: ((github-ci-release-token))
       vars:
-        <<: *registry-mirror-vars
+        <<: *registry-image-resource-source
     - put: github-pre-release
       params:
         name: generated-changelog/tag
@@ -233,7 +228,7 @@ jobs:
       params:
         RELEASE_TYPE: RC
         <<: *artifactory-task-params
-        <<: *registry-mirror-vars
+        <<: *registry-image-resource-source
     - task: generate-changelog
       file: git-repo/ci/tasks/generate-changelog.yml
       params:
@@ -241,7 +236,7 @@ jobs:
         GITHUB_USERNAME: ((github-username))
         GITHUB_TOKEN: ((github-ci-release-token))
       vars:
-        <<: *registry-mirror-vars
+        <<: *registry-image-resource-source
     - put: github-pre-release
       params:
         name: generated-changelog/tag
@@ -283,7 +278,7 @@ jobs:
       params:
         RELEASE_TYPE: RELEASE
         <<: *artifactory-task-params
-        <<: *registry-mirror-vars
+        <<: *registry-image-resource-source
         <<: *sonatype-task-params
 - name: create-github-release
   serial: true
@@ -303,7 +298,7 @@ jobs:
         GITHUB_USERNAME: ((github-username))
         GITHUB_TOKEN: ((github-ci-release-token))
       vars:
-        <<: *registry-mirror-vars
+        <<: *registry-image-resource-source
     - put: github-release
       params:
         name: generated-changelog/tag
diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml
index 48efb9fd..dc38cf49 100755
--- a/ci/tasks/generate-changelog.yml
+++ b/ci/tasks/generate-changelog.yml
@@ -4,11 +4,9 @@ image_resource:
   type: registry-image
   source:
     repository: springio/github-changelog-generator
-    tag: '0.0.7'
-    registry_mirror:
-      host: ((registry-mirror-host))
-      username: ((registry-mirror-username))
-      password: ((registry-mirror-password))
+    tag: '0.0.8'
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
   - name: git-repo
   - name: artifactory-repo
diff --git a/ci/tasks/promote-version.yml b/ci/tasks/promote-version.yml
index c4f24c55..683482f8 100644
--- a/ci/tasks/promote-version.yml
+++ b/ci/tasks/promote-version.yml
@@ -5,6 +5,8 @@ image_resource:
   source:
     repository: springio/concourse-release-scripts
     tag: '0.3.4'
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
   - name: git-repo
   - name: artifactory-repo