Skip to content

Commit 1172dbf

Browse files
committed
Log into DockerHub prior to running CI builds
Closes gh-24038
1 parent d5980be commit 1172dbf

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

ci/pipeline.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,16 @@ anchors:
1414
GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
1515
BRANCH: ((branch))
1616
CI: true
17+
docker-hub-task-params: &docker-hub-task-params
18+
DOCKER_HUB_USERNAME: ((docker-hub-username))
19+
DOCKER_HUB_PASSWORD: ((docker-hub-password))
1720
build-project-task-params: &build-project-task-params
1821
privileged: true
1922
timeout: ((task-timeout))
2023
file: git-repo/ci/tasks/build-project.yml
2124
params:
2225
<<: *gradle-enterprise-task-params
26+
<<: *docker-hub-task-params
2327
github-task-params: &github-task-params
2428
GITHUB_REPO: spring-boot
2529
GITHUB_ORGANIZATION: spring-projects
@@ -283,18 +287,21 @@ jobs:
283287
timeout: ((task-timeout))
284288
params:
285289
<<: *gradle-enterprise-task-params
290+
<<: *docker-hub-task-params
286291
- task: build-integration-tests
287292
image: ci-image
288293
file: git-repo/ci/tasks/build-integration-tests.yml
289294
timeout: ((task-timeout))
290295
params:
291296
<<: *gradle-enterprise-task-params
297+
<<: *docker-hub-task-params
292298
- task: build-deployment-tests
293299
image: ci-image
294300
file: git-repo/ci/tasks/build-deployment-tests.yml
295301
timeout: ((task-timeout))
296302
params:
297303
<<: *gradle-enterprise-task-params
304+
<<: *docker-hub-task-params
298305
on_failure:
299306
do:
300307
- put: repo-status-build
@@ -376,18 +383,21 @@ jobs:
376383
timeout: ((task-timeout))
377384
params:
378385
<<: *gradle-enterprise-task-params
386+
<<: *docker-hub-task-params
379387
- task: build-integration-tests
380388
image: ci-image-jdk11
381389
file: git-repo/ci/tasks/build-integration-tests.yml
382390
timeout: ((task-timeout))
383391
params:
384392
<<: *gradle-enterprise-task-params
393+
<<: *docker-hub-task-params
385394
- task: build-deployment-tests
386395
image: ci-image-jdk11
387396
file: git-repo/ci/tasks/build-deployment-tests.yml
388397
timeout: ((task-timeout))
389398
params:
390399
<<: *gradle-enterprise-task-params
400+
<<: *docker-hub-task-params
391401
on_failure:
392402
do:
393403
- put: repo-status-jdk11-build
@@ -420,18 +430,21 @@ jobs:
420430
file: git-repo/ci/tasks/build-smoke-tests.yml
421431
params:
422432
<<: *gradle-enterprise-task-params
433+
<<: *docker-hub-task-params
423434
- task: build-integration-tests
424435
timeout: ((task-timeout))
425436
image: ci-image-jdk15
426437
file: git-repo/ci/tasks/build-integration-tests.yml
427438
params:
428439
<<: *gradle-enterprise-task-params
440+
<<: *docker-hub-task-params
429441
- task: build-deployment-tests
430442
timeout: ((task-timeout))
431443
image: ci-image-jdk15
432444
file: git-repo/ci/tasks/build-deployment-tests.yml
433445
params:
434446
<<: *gradle-enterprise-task-params
447+
<<: *docker-hub-task-params
435448
on_failure:
436449
do:
437450
- put: repo-status-jdk15-build

ci/scripts/common.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@ if [[ -d $PWD/embedmongo && ! -d $HOME/.embedmongo ]]; then
55
ln -s "$PWD/embedmongo" "$HOME/.embedmongo"
66
fi
77

8+
if [[ -n $DOCKER_HUB_USERNAME ]]; then
9+
docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD
10+
fi
11+
812
cleanup_maven_repo "org.springframework.boot"

0 commit comments

Comments
 (0)