Fix docker credentials in release pipeline

Author: bclozel

ci/parameters.yml

@@ -8,7 +8,4 @@ build-name: "spring-graphql"
 pipeline-name: "spring-graphql"
 concourse-url: "https://ci.spring.io"
 task-timeout: 45m
-registry-mirror-host: docker.repo.spring.io
-registry-mirror-username: ((artifactory-username))
-registry-mirror-password: ((artifactory-password))
 sonatype-staging-profile: "org.springframework"

ci/pipeline.yml

@@ -2,6 +2,9 @@ anchors:
  docker-hub-task-params: &docker-hub-task-params
  DOCKER_HUB_USERNAME: ((docker-hub-username))
  DOCKER_HUB_PASSWORD: ((docker-hub-password))
+ registry-image-resource-source: &registry-image-resource-source
+ username: ((docker-hub-username))
+ password: ((docker-hub-password))
  gradle-enterprise-task-params: &gradle-enterprise-task-params
  GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
  GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
@@ -10,10 +13,6 @@ anchors:
  ARTIFACTORY_SERVER: ((artifactory-server))
  ARTIFACTORY_USERNAME: ((artifactory-username))
  ARTIFACTORY_PASSWORD: ((artifactory-password))
- registry-mirror-vars: &registry-mirror-vars
- registry-mirror-host: ((registry-mirror-host))
- registry-mirror-username: ((registry-mirror-username))
- registry-mirror-password: ((registry-mirror-password))
  sonatype-task-params: &sonatype-task-params
  SONATYPE_USERNAME: ((sonatype-username))
  SONATYPE_PASSWORD: ((sonatype-password))
@@ -24,16 +23,19 @@ resource_types:
 - name: registry-image
  type: registry-image
  source:
+ <<: *registry-image-resource-source
  repository: concourse/registry-image-resource
  tag: 1.5.0
 - name: artifactory-resource
  type: registry-image
  source:
+ <<: *registry-image-resource-source
  repository: springio/artifactory-resource
  tag: 0.0.17
 - name: github-release
  type: registry-image
  source:
+ <<: *registry-image-resource-source
  repository: concourse/github-release-resource
  tag: 1.5.5
 
@@ -57,8 +59,7 @@ resources:
  type: registry-image
  icon: docker
  source:
- username: ((docker-hub-username))
- password: ((docker-hub-password))
+ <<: *registry-image-resource-source
  tag: ((milestone))
  repository: ((docker-hub-organization))/spring-graphql-ci-image
 - name: artifactory-repo
@@ -100,7 +101,7 @@ jobs:
  image: ci-image
  vars:
  ci-image-name: ci-image
- <<: *registry-mirror-vars
+ <<: *registry-image-resource-source
  - put: ci-image
  params:
  image: ci-image/image.tar
@@ -183,8 +184,6 @@ jobs:
  RELEASE_TYPE: M
  GITHUB_USERNAME: ((github-username))
  GITHUB_TOKEN: ((github-ci-release-token))
- vars:
- <<: *registry-mirror-vars
  - put: github-pre-release
  params:
  name: generated-changelog/tag
@@ -232,8 +231,6 @@ jobs:
  RELEASE_TYPE: RC
  GITHUB_USERNAME: ((github-username))
  GITHUB_TOKEN: ((github-ci-release-token))
- vars:
- <<: *registry-mirror-vars
  - put: github-pre-release
  params:
  name: generated-changelog/tag
@@ -293,8 +290,6 @@ 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

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: ((registry-mirror-host))
- username: ((registry-mirror-username))
- password: ((registry-mirror-password))
+ username: ((docker-hub-username))
+ password: ((docker-hub-password))
 inputs:
 - name: ci-images-git-repo
 outputs:

ci/tasks/generate-changelog.yml

@@ -5,10 +5,8 @@ image_resource:
  source:
  repository: springio/github-changelog-generator
  tag: '0.0.7'
- registry_mirror:
- host: ((registry-mirror-host))
- username: ((registry-mirror-username))
- password: ((registry-mirror-password))
+ username: ((docker-hub-username))
+ password: ((docker-hub-password))
 inputs:
  - name: git-repo
  - name: artifactory-repo

ci/tasks/promote-version.yml

@@ -5,6 +5,8 @@ image_resource:
  source:
  repository: springio/concourse-release-scripts
  tag: '0.3.4'
+ username: ((docker-hub-username))
+ password: ((docker-hub-password))
 inputs:
  - name: git-repo
  - name: artifactory-repo