Skip to content

Commit 70ecaac

Browse files
committed
Configure a mirror for registry-image image_resources
Closes gh-27441
1 parent 79990a1 commit 70ecaac

File tree

4 files changed

+24
-0
lines changed

4 files changed

+24
-0
lines changed

ci/parameters.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ milestone: "2.4.x"
1111
build-name: "spring-boot"
1212
concourse-url: "https://ci.spring.io"
1313
task-timeout: 2h00m
14+
registry-mirror-host: docker.repo.spring.io
15+
registry-mirror-username: ((artifactory-username))
16+
registry-mirror-password: ((artifactory-password))

ci/pipeline.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ anchors:
8080
gradle-publish-params: &gradle-publish-params
8181
gradle_publish_key: ((gradle-publish-key))
8282
gradle_publish_secret: ((gradle-publish-secret))
83+
registry-mirror-vars: &registry-mirror-vars
84+
registry-mirror-host: ((registry-mirror-host))
85+
registry-mirror-username: ((registry-mirror-username))
86+
registry-mirror-password: ((registry-mirror-password))
8387
resource_types:
8488
- name: artifactory-resource
8589
type: registry-image
@@ -232,20 +236,23 @@ jobs:
232236
image: ci-image
233237
vars:
234238
ci-image-name: ci-image
239+
<<: *registry-mirror-vars
235240
- task: build-ci-image-jdk11
236241
privileged: true
237242
file: git-repo/ci/tasks/build-ci-image.yml
238243
output_mapping:
239244
image: ci-image-jdk11
240245
vars:
241246
ci-image-name: ci-image-jdk11
247+
<<: *registry-mirror-vars
242248
- task: build-ci-image-jdk16
243249
privileged: true
244250
file: git-repo/ci/tasks/build-ci-image.yml
245251
output_mapping:
246252
image: ci-image-jdk16
247253
vars:
248254
ci-image-name: ci-image-jdk16
255+
<<: *registry-mirror-vars
249256
- in_parallel:
250257
- put: ci-image
251258
params:
@@ -540,6 +547,8 @@ jobs:
540547
RELEASE_TYPE: M
541548
GITHUB_USERNAME: ((github-username))
542549
GITHUB_TOKEN: ((github-ci-release-token))
550+
vars:
551+
<<: *registry-mirror-vars
543552
- put: github-pre-release
544553
params:
545554
name: generated-changelog/tag
@@ -569,6 +578,8 @@ jobs:
569578
RELEASE_TYPE: RC
570579
GITHUB_USERNAME: ((github-username))
571580
GITHUB_TOKEN: ((github-ci-release-token))
581+
vars:
582+
<<: *registry-mirror-vars
572583
- put: github-pre-release
573584
params:
574585
name: generated-changelog/tag
@@ -626,6 +637,8 @@ jobs:
626637
RELEASE_TYPE: RELEASE
627638
GITHUB_USERNAME: ((github-username))
628639
GITHUB_TOKEN: ((github-ci-release-token))
640+
vars:
641+
<<: *registry-mirror-vars
629642
- put: github-release
630643
params:
631644
name: generated-changelog/tag

ci/tasks/build-ci-image.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ image_resource:
44
type: registry-image
55
source:
66
repository: vito/oci-build-task
7+
registry_mirror:
8+
host: ((registry-mirror-host))
9+
username: ((registry-mirror-username))
10+
password: ((registry-mirror-password))
711
inputs:
812
- name: ci-images-git-repo
913
outputs:

ci/tasks/generate-changelog.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ image_resource:
55
source:
66
repository: springio/github-changelog-generator
77
tag: '0.0.6'
8+
registry_mirror:
9+
host: ((registry-mirror-host))
10+
username: ((registry-mirror-username))
11+
password: ((registry-mirror-password))
812
inputs:
913
- name: git-repo
1014
- name: artifactory-repo

0 commit comments

Comments
 (0)