From 1172dbfec9c09d6e688c4afc0cdc76c84f9332b7 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Wed, 4 Nov 2020 20:31:49 +0000
Subject: [PATCH 1/2] Log into DockerHub prior to running CI builds

Closes gh-24038
---
 ci/pipeline.yml      | 13 +++++++++++++
 ci/scripts/common.sh |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index f3b0150ef464..606c7cbcbd80 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -14,12 +14,16 @@ anchors:
     GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
     BRANCH: ((branch))
     CI: true
+  docker-hub-task-params: &docker-hub-task-params
+    DOCKER_HUB_USERNAME: ((docker-hub-username))
+    DOCKER_HUB_PASSWORD: ((docker-hub-password))
   build-project-task-params: &build-project-task-params
     privileged: true
     timeout: ((task-timeout))
     file: git-repo/ci/tasks/build-project.yml
     params:
       <<: *gradle-enterprise-task-params
+      <<: *docker-hub-task-params
   github-task-params: &github-task-params
     GITHUB_REPO: spring-boot
     GITHUB_ORGANIZATION: spring-projects
@@ -283,18 +287,21 @@ jobs:
         timeout: ((task-timeout))
         params:
           <<: *gradle-enterprise-task-params
+          <<: *docker-hub-task-params
       - task: build-integration-tests
         image: ci-image
         file: git-repo/ci/tasks/build-integration-tests.yml
         timeout: ((task-timeout))
         params:
           <<: *gradle-enterprise-task-params
+          <<: *docker-hub-task-params
       - task: build-deployment-tests
         image: ci-image
         file: git-repo/ci/tasks/build-deployment-tests.yml
         timeout: ((task-timeout))
         params:
           <<: *gradle-enterprise-task-params
+          <<: *docker-hub-task-params
     on_failure:
       do:
       - put: repo-status-build
@@ -376,18 +383,21 @@ jobs:
         timeout: ((task-timeout))
         params:
           <<: *gradle-enterprise-task-params
+          <<: *docker-hub-task-params
       - task: build-integration-tests
         image: ci-image-jdk11
         file: git-repo/ci/tasks/build-integration-tests.yml
         timeout: ((task-timeout))
         params:
           <<: *gradle-enterprise-task-params
+          <<: *docker-hub-task-params
       - task: build-deployment-tests
         image: ci-image-jdk11
         file: git-repo/ci/tasks/build-deployment-tests.yml
         timeout: ((task-timeout))
         params:
           <<: *gradle-enterprise-task-params
+          <<: *docker-hub-task-params
     on_failure:
       do:
       - put: repo-status-jdk11-build
@@ -420,18 +430,21 @@ jobs:
               file: git-repo/ci/tasks/build-smoke-tests.yml
               params:
                 <<: *gradle-enterprise-task-params
+                <<: *docker-hub-task-params
             - task: build-integration-tests
               timeout: ((task-timeout))
               image: ci-image-jdk15
               file: git-repo/ci/tasks/build-integration-tests.yml
               params:
                 <<: *gradle-enterprise-task-params
+                <<: *docker-hub-task-params
             - task: build-deployment-tests
               timeout: ((task-timeout))
               image: ci-image-jdk15
               file: git-repo/ci/tasks/build-deployment-tests.yml
               params:
                 <<: *gradle-enterprise-task-params
+                <<: *docker-hub-task-params
       on_failure:
         do:
           - put: repo-status-jdk15-build
diff --git a/ci/scripts/common.sh b/ci/scripts/common.sh
index 0c0f901c5072..ca7724f35dc2 100644
--- a/ci/scripts/common.sh
+++ b/ci/scripts/common.sh
@@ -5,4 +5,8 @@ if [[ -d $PWD/embedmongo && ! -d $HOME/.embedmongo ]]; then
 	ln -s "$PWD/embedmongo" "$HOME/.embedmongo"
 fi
 
+if [[ -n $DOCKER_HUB_USERNAME ]]; then
+	docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD
+fi
+
 cleanup_maven_repo "org.springframework.boot"

From d3ea48b7a8fe7d6b2b6d8925994034090e3d7997 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Wed, 4 Nov 2020 20:31:49 +0000
Subject: [PATCH 2/2] Configure DockerHub credentials on staging builds

See gh-24038
---
 ci/pipeline.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 606c7cbcbd80..4d52d89b72a2 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -491,6 +491,7 @@ jobs:
     image: ci-image
     file: git-repo/ci/tasks/stage.yml
     params:
+      <<: *docker-hub-task-params
       RELEASE_TYPE: M
       GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
       BRANCH: ((branch))
@@ -512,6 +513,7 @@ jobs:
     image: ci-image
     file: git-repo/ci/tasks/stage.yml
     params:
+      <<: *docker-hub-task-params
       RELEASE_TYPE: RC
       GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
       BRANCH: ((branch))
@@ -533,6 +535,7 @@ jobs:
     image: ci-image
     file: git-repo/ci/tasks/stage.yml
     params:
+      <<: *docker-hub-task-params
       RELEASE_TYPE: RELEASE
       GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
       BRANCH: ((branch))