From d2372e4679f0c3b8e86099dc6a12b7086a5e6f3f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 22 Aug 2021 08:48:44 +0200 Subject: [PATCH] Configure a mirror for registry-image image_resources --- ci/parameters.yml | 5 ++++- ci/pipeline.yml | 9 +++++++++ ci/tasks/build-ci-image.yml | 4 ++++ ci/tasks/generate-changelog.yml | 4 ++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index a857c7c2..2b01912f 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -6,4 +6,7 @@ branch: "0.10.x" milestone: "0.10.x" build-name: "initializr" concourse-url: "https://ci.spring.io" -task-timeout: 30m \ No newline at end of file +task-timeout: 30m +registry-mirror-host: docker.repo.spring.io +registry-mirror-username: ((artifactory-username)) +registry-mirror-password: ((artifactory-password)) \ No newline at end of file diff --git a/ci/pipeline.yml b/ci/pipeline.yml index e6159bc8..8a29e85e 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -42,6 +42,10 @@ anchors: SONATYPE_PASSWORD: ((sonatype-password)) SONATYPE_URL: ((sonatype-url)) SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id)) + registry-mirror-vars: ®istry-mirror-vars + registry-mirror-host: ((registry-mirror-host)) + registry-mirror-username: ((registry-mirror-username)) + registry-mirror-password: ((registry-mirror-password)) resource_types: - name: artifactory-resource type: registry-image @@ -173,6 +177,7 @@ jobs: image: ci-image vars: ci-image-name: ci-image + <<: *registry-mirror-vars - task: build-ci-image-jdk11 privileged: true file: git-repo/ci/tasks/build-ci-image.yml @@ -180,6 +185,7 @@ jobs: image: ci-image-jdk11 vars: ci-image-name: ci-image-jdk11 + <<: *registry-mirror-vars - task: build-ci-image-jdk16 privileged: true file: git-repo/ci/tasks/build-ci-image.yml @@ -187,6 +193,7 @@ jobs: image: ci-image-jdk16 vars: ci-image-name: ci-image-jdk16 + <<: *registry-mirror-vars - in_parallel: - put: ci-image params: @@ -386,6 +393,8 @@ jobs: RELEASE_TYPE: RELEASE GITHUB_USERNAME: ((github-username)) GITHUB_TOKEN: ((github-ci-release-token)) + vars: + <<: *registry-mirror-vars - put: github-release params: name: generated-changelog/tag diff --git a/ci/tasks/build-ci-image.yml b/ci/tasks/build-ci-image.yml index 30b2df98..716cc2e8 100644 --- a/ci/tasks/build-ci-image.yml +++ b/ci/tasks/build-ci-image.yml @@ -4,6 +4,10 @@ image_resource: type: registry-image source: repository: vito/oci-build-task + registry_mirror: + host: ((registry-mirror-host)) + username: ((registry-mirror-username)) + password: ((registry-mirror-password)) inputs: - name: ci-images-git-repo outputs: diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml index f4351023..ad0691b0 100644 --- a/ci/tasks/generate-changelog.yml +++ b/ci/tasks/generate-changelog.yml @@ -5,6 +5,10 @@ image_resource: source: repository: springio/github-changelog-generator tag: '0.0.6' + registry_mirror: + host: ((registry-mirror-host)) + username: ((registry-mirror-username)) + password: ((registry-mirror-password)) inputs: - name: git-repo - name: artifactory-repo