From 5b03199c4f8b2c221e71d8e7052bb9f04c2addf6 Mon Sep 17 00:00:00 2001 From: "Dennis J. Bell" Date: Tue, 9 May 2023 10:39:45 -0700 Subject: [PATCH] [ci] Fix genesis-ci source image --- ci/pipeline/resources/generate-ci-image.yml | 11 +++++++---- ci/settings.yml | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ci/pipeline/resources/generate-ci-image.yml b/ci/pipeline/resources/generate-ci-image.yml index 79d85327..44e5a423 100644 --- a/ci/pipeline/resources/generate-ci-image.yml +++ b/ci/pipeline/resources/generate-ci-image.yml @@ -1,6 +1,6 @@ resources: - name: genesis-ci - type: registry-image + type: docker-image source: username: (( grab meta.dockerhub.username )) password: (( grab meta.dockerhub.password )) @@ -8,7 +8,10 @@ resources: - name: dockerfile type: git source: - .: (( inject resources.git.source )) + uri: (( grab meta.github.uri )) + branch: (( grab meta.github.branch )) + private_key: (( grab meta.github.private_key )) + disable_ci_skip: true paths: - ci/Dockerfile - name: concourse-image @@ -16,5 +19,5 @@ resources: source: username: (( grab meta.dockerhub.username )) password: (( grab meta.dockerhub.password )) - repository: registry.ops.scalecf.net/genesis-community/genesis-ci - tag: latest-rc + repository: (( grab meta.image.src-image )) + tag: (( grab meta.image.src-tag )) diff --git a/ci/settings.yml b/ci/settings.yml index 23b69ead..e8ef63ca 100644 --- a/ci/settings.yml +++ b/ci/settings.yml @@ -11,6 +11,8 @@ meta: # use it, instead of standard concourse images. image: name: registry.ops.scalecf.net/genesis-community/genesis-ci + src-image: registry.ops.scalecf.net/genesis-community/genesis + src-tag: latest aws: endpoint: ((aws.endpoint))