From 7aa16460d4a66b4849866d82ef76eaee92d07e41 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 19 Nov 2021 10:32:33 -0800 Subject: [PATCH] Update CI docker mirrors --- ci/pipeline.yml | 13 +++++++++++++ ci/tasks/build-ci-image.yml | 5 +++++ ci/tasks/generate-changelog.yml | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 784de17d411a..668a6e672b02 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -88,6 +88,10 @@ anchors: gradle-publish-params: &gradle-publish-params GRADLE_PUBLISH_KEY: ((gradle-publish-key)) GRADLE_PUBLISH_SECRET: ((gradle-publish-secret)) + docker-hub-vars: &docker-hub-mirror-vars + docker-hub-mirror: ((docker-hub-mirror)) + docker-hub-mirror-username: ((docker-hub-mirror-username)) + docker-hub-mirror-password: ((docker-hub-mirror-password)) resource_types: - name: artifactory-resource type: registry-image @@ -251,6 +255,7 @@ jobs: image: ci-image vars: ci-image-name: ci-image + <<: *docker-hub-mirror-vars - task: build-ci-image-jdk11 privileged: true file: git-repo/ci/tasks/build-ci-image.yml @@ -258,6 +263,7 @@ jobs: image: ci-image-jdk11 vars: ci-image-name: ci-image-jdk11 + <<: *docker-hub-mirror-vars - task: build-ci-image-jdk17 privileged: true file: git-repo/ci/tasks/build-ci-image.yml @@ -265,6 +271,7 @@ jobs: image: ci-image-jdk17 vars: ci-image-name: ci-image-jdk17 + <<: *docker-hub-mirror-vars - in_parallel: - put: ci-image params: @@ -559,6 +566,8 @@ jobs: RELEASE_TYPE: M GITHUB_USERNAME: ((github-username)) GITHUB_TOKEN: ((github-ci-release-token)) + vars: + <<: *docker-hub-mirror-vars - put: github-pre-release params: name: generated-changelog/tag @@ -588,6 +597,8 @@ jobs: RELEASE_TYPE: RC GITHUB_USERNAME: ((github-username)) GITHUB_TOKEN: ((github-ci-release-token)) + vars: + <<: *docker-hub-mirror-vars - put: github-pre-release params: name: generated-changelog/tag @@ -647,6 +658,8 @@ jobs: RELEASE_TYPE: RELEASE GITHUB_USERNAME: ((github-username)) GITHUB_TOKEN: ((github-ci-release-token)) + vars: + <<: *docker-hub-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 c7af47efdd3f..3d27bfde67b8 100644 --- a/ci/tasks/build-ci-image.yml +++ b/ci/tasks/build-ci-image.yml @@ -5,6 +5,10 @@ image_resource: source: repository: concourse/oci-build-task tag: 0.9.1 + registry_mirror: + host: ((docker-mirror)) + username: ((docker-mirror-username)) + password: ((docker-mirror-password)) inputs: - name: ci-images-git-repo outputs: @@ -15,6 +19,7 @@ params: CONTEXT: ci-images-git-repo/ci/images DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile DOCKER_HUB_AUTH: ((docker-hub-auth)) + REGISTRY_MIRRORS: ((docker-hub-mirror)) run: path: /bin/sh args: diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml index b3f40278c8e6..2186a259e557 100755 --- 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.7' + registry_mirror: + host: ((docker-hub-mirror)) + username: ((docker-hub-mirror-username)) + password: ((docker-hub-mirror-password)) inputs: - name: git-repo - name: artifactory-repo