From c2559c2893e495ca79e29af3e37eea3cc0e92c4a Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 28 Oct 2021 16:35:03 +0200 Subject: [PATCH] Configure Docker CI image building --- ci/parameters.yml | 5 ++++- ci/pipeline.yml | 7 ++++++- ci/tasks/build-ci-image.yml | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ci/parameters.yml b/ci/parameters.yml index 88b4960e..a11ed35a 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -6,4 +6,7 @@ branch: "main" build-name: "spring-graphql" pipeline-name: "spring-graphql" concourse-url: "https://ci.spring.io" -task-timeout: 45m \ No newline at end of file +task-timeout: 45m +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 80144882..0f15a180 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -11,7 +11,11 @@ anchors: ARTIFACTORY_SERVER: ((artifactory-server)) ARTIFACTORY_USERNAME: ((artifactory-username)) ARTIFACTORY_PASSWORD: ((artifactory-password)) - + 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 @@ -63,6 +67,7 @@ jobs: image: ci-image vars: ci-image-name: ci-image + <<: *registry-mirror-vars - put: ci-image params: image: ci-image/image.tar diff --git a/ci/tasks/build-ci-image.yml b/ci/tasks/build-ci-image.yml index 2c397c67..4d588c31 100644 --- a/ci/tasks/build-ci-image.yml +++ b/ci/tasks/build-ci-image.yml @@ -4,6 +4,11 @@ image_resource: type: registry-image source: repository: concourse/oci-build-task + tag: 0.9.0 + registry_mirror: + host: ((registry-mirror-host)) + username: ((registry-mirror-username)) + password: ((registry-mirror-password)) inputs: - name: ci-images-git-repo outputs: