diff --git a/ci/pipeline.yml b/ci/pipeline.yml index d1b122c092..598e5736ed 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -11,8 +11,6 @@ anchors: username: ((docker-hub-username)) password: ((docker-hub-password)) tag: ((milestone)) - registry_mirror: - host: ((docker-hub-mirror)) gradle-enterprise-task-params: &gradle-enterprise-task-params GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) GRADLE_ENTERPRISE_CACHE_URL: ((gradle_enterprise_cache_url)) @@ -95,8 +93,6 @@ anchors: gradle-publish-params: &gradle-publish-params GRADLE_PUBLISH_KEY: ((gradle-publish-key)) GRADLE_PUBLISH_SECRET: ((gradle-publish-secret)) - docker-hub-mirror-vars: &docker-hub-mirror-vars - docker-hub-mirror: ((docker-hub-mirror)) resource_types: - name: registry-image type: registry-image @@ -259,7 +255,6 @@ jobs: image: ci-image vars: ci-image-name: ci-image - <<: *docker-hub-mirror-vars - task: build-ci-image-jdk19 privileged: true file: git-repo/ci/tasks/build-ci-image.yml @@ -267,7 +262,6 @@ jobs: image: ci-image-jdk19 vars: ci-image-name: ci-image-jdk19 - <<: *docker-hub-mirror-vars - in_parallel: - put: ci-image params: @@ -528,8 +522,6 @@ 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 @@ -559,8 +551,6 @@ 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 @@ -620,8 +610,6 @@ 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 b50749b19e..a57af31acd 100644 --- a/ci/tasks/build-ci-image.yml +++ b/ci/tasks/build-ci-image.yml @@ -5,10 +5,8 @@ image_resource: source: repository: concourse/oci-build-task tag: 0.10.0 - registry_mirror: - host: ((docker-hub-mirror)) - username: ((docker-hub-mirror-username)) - password: ((docker-hub-mirror-password)) + username: ((docker-hub-username)) + password: ((docker-hub-password)) inputs: - name: ci-images-git-repo outputs: diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml index 5614a64a52..f4004743db 100755 --- a/ci/tasks/generate-changelog.yml +++ b/ci/tasks/generate-changelog.yml @@ -5,10 +5,8 @@ image_resource: source: repository: springio/github-changelog-generator tag: '0.0.8' - registry_mirror: - host: ((docker-hub-mirror)) - username: ((docker-hub-mirror-username)) - password: ((docker-hub-mirror-password)) + username: ((docker-hub-username)) + password: ((docker-hub-password)) inputs: - name: git-repo - name: artifactory-repo