Skip to content

Commit 1026936

Browse files
committed
Reinstate CI image generation mirrors
See gh-25135
1 parent 0074d62 commit 1026936

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

ci/pipeline.yml

+13
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ anchors:
8888
gradle-publish-params: &gradle-publish-params
8989
GRADLE_PUBLISH_KEY: ((gradle-publish-key))
9090
GRADLE_PUBLISH_SECRET: ((gradle-publish-secret))
91+
docker-hub-mirror-vars: &docker-hub-mirror-vars
92+
docker-hub-mirror: ((docker-hub-mirror))
93+
docker-hub-mirror-username: ((docker-hub-mirror-username))
94+
docker-hub-mirror-password: ((docker-hub-mirror-password))
9195
resource_types:
9296
- name: artifactory-resource
9397
type: registry-image
@@ -251,20 +255,23 @@ jobs:
251255
image: ci-image
252256
vars:
253257
ci-image-name: ci-image
258+
<<: *docker-hub-mirror-vars
254259
- task: build-ci-image-jdk11
255260
privileged: true
256261
file: git-repo/ci/tasks/build-ci-image.yml
257262
output_mapping:
258263
image: ci-image-jdk11
259264
vars:
260265
ci-image-name: ci-image-jdk11
266+
<<: *docker-hub-mirror-vars
261267
- task: build-ci-image-jdk17
262268
privileged: true
263269
file: git-repo/ci/tasks/build-ci-image.yml
264270
output_mapping:
265271
image: ci-image-jdk17
266272
vars:
267273
ci-image-name: ci-image-jdk17
274+
<<: *docker-hub-mirror-vars
268275
- in_parallel:
269276
- put: ci-image
270277
params:
@@ -559,6 +566,8 @@ jobs:
559566
RELEASE_TYPE: M
560567
GITHUB_USERNAME: ((github-username))
561568
GITHUB_TOKEN: ((github-ci-release-token))
569+
vars:
570+
<<: *docker-hub-mirror-vars
562571
- put: github-pre-release
563572
params:
564573
name: generated-changelog/tag
@@ -588,6 +597,8 @@ jobs:
588597
RELEASE_TYPE: RC
589598
GITHUB_USERNAME: ((github-username))
590599
GITHUB_TOKEN: ((github-ci-release-token))
600+
vars:
601+
<<: *docker-hub-mirror-vars
591602
- put: github-pre-release
592603
params:
593604
name: generated-changelog/tag
@@ -647,6 +658,8 @@ jobs:
647658
RELEASE_TYPE: RELEASE
648659
GITHUB_USERNAME: ((github-username))
649660
GITHUB_TOKEN: ((github-ci-release-token))
661+
vars:
662+
<<: *docker-hub-mirror-vars
650663
- put: github-release
651664
params:
652665
name: generated-changelog/tag

ci/tasks/build-ci-image.yml

+5
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ image_resource:
55
source:
66
repository: concourse/oci-build-task
77
tag: 0.9.1
8+
registry_mirror:
9+
host: ((docker-hub-mirror))
10+
username: ((docker-hub-mirror-username))
11+
password: ((docker-hub-mirror-password))
812
inputs:
913
- name: ci-images-git-repo
1014
outputs:
@@ -15,6 +19,7 @@ params:
1519
CONTEXT: ci-images-git-repo/ci/images
1620
DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
1721
DOCKER_HUB_AUTH: ((docker-hub-auth))
22+
REGISTRY_MIRRORS: ((docker-hub-mirror))
1823
run:
1924
path: /bin/sh
2025
args:

ci/tasks/generate-changelog.yml

+4
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.7'
8+
registry_mirror:
9+
host: ((docker-hub-mirror))
10+
username: ((docker-hub-mirror-username))
11+
password: ((docker-hub-mirror-password))
812
inputs:
913
- name: git-repo
1014
- name: artifactory-repo

0 commit comments

Comments
 (0)