From f74123038a758b964074f6e822c61e45836b2d71 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 15 Apr 2021 09:08:15 +0100
Subject: [PATCH 1/5] Start Docker before running a staging build

Closes gh-26130
---
 ci/tasks/stage.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ci/tasks/stage.yml b/ci/tasks/stage.yml
index be41bb3e31..b935232b69 100644
--- a/ci/tasks/stage.yml
+++ b/ci/tasks/stage.yml
@@ -14,4 +14,10 @@ params:
 caches:
 - path: gradle
 run:
-  path: git-repo/ci/scripts/stage.sh
+  path: bash
+  args:
+    - -ec
+    - |
+      source /docker-lib.sh
+      start_docker
+      ${PWD}/git-repo/ci/scripts/stage.sh

From 6073cf7063b1e2752a0130deed1b139a2e4e56a0 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 15 Apr 2021 09:30:14 +0100
Subject: [PATCH 2/5] Marking staging tasks as privileged so they can start
 Docker

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

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 0837a7dc47..09215dd0ec 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -451,6 +451,7 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: M
+      privileged: true
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
   - put: artifactory-repo
@@ -471,6 +472,7 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RC
+      privileged: true
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
   - put: artifactory-repo
@@ -491,6 +493,7 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RELEASE
+      privileged: true
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
   - put: artifactory-repo

From bfe8e5ac192a463f94910c3648e23b5adc6b48e7 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 15 Apr 2021 10:11:43 +0100
Subject: [PATCH 3/5] Revert changes to make staging run Docker

See gh-26130
---
 ci/pipeline.yml    | 3 ---
 ci/tasks/stage.yml | 8 +-------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 09215dd0ec..0837a7dc47 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -451,7 +451,6 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: M
-      privileged: true
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
   - put: artifactory-repo
@@ -472,7 +471,6 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RC
-      privileged: true
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
   - put: artifactory-repo
@@ -493,7 +491,6 @@ jobs:
     file: git-repo/ci/tasks/stage.yml
     params:
       RELEASE_TYPE: RELEASE
-      privileged: true
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
   - put: artifactory-repo
diff --git a/ci/tasks/stage.yml b/ci/tasks/stage.yml
index b935232b69..be41bb3e31 100644
--- a/ci/tasks/stage.yml
+++ b/ci/tasks/stage.yml
@@ -14,10 +14,4 @@ params:
 caches:
 - path: gradle
 run:
-  path: bash
-  args:
-    - -ec
-    - |
-      source /docker-lib.sh
-      start_docker
-      ${PWD}/git-repo/ci/scripts/stage.sh
+  path: git-repo/ci/scripts/stage.sh

From 01fb599f6e171d7d6f281b9c730893a4c50f5f1a Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 15 Apr 2021 10:13:50 +0100
Subject: [PATCH 4/5] Revert "Attempt to overcome Docker rate limiting on CI"

This reverts commit 51d57e19d092f59ee7389a4423e4988de30bc44d.

See gh-25838
---
 ci/scripts/common.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ci/scripts/common.sh b/ci/scripts/common.sh
index ffa18ce7ab..ca7724f35d 100644
--- a/ci/scripts/common.sh
+++ b/ci/scripts/common.sh
@@ -7,8 +7,6 @@ fi
 
 if [[ -n $DOCKER_HUB_USERNAME ]]; then
 	docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD
-	docker pull paketobuildpacks/run:tiny-cnb
-	docker pull springci/spring-boot-cnb-builder:0.0.1
 fi
 
 cleanup_maven_repo "org.springframework.boot"

From dea62c173420e33e72ef4617a8b5d4d10ea6edb5 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 15 Apr 2021 09:52:11 +0000
Subject: [PATCH 5/5] Next development version (v2.3.11.BUILD-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index b66c1f0dfc..80152eeb69 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.3.10.BUILD-SNAPSHOT
+version=2.3.11.BUILD-SNAPSHOT
 
 org.gradle.caching=true
 org.gradle.parallel=true