From 8a265242219e8899e0f71f12debb3b9dbddb90fe Mon Sep 17 00:00:00 2001 From: CI Bot Date: Tue, 16 Apr 2024 13:43:30 +0000 Subject: [PATCH] ci(shared): bump vendored ci files --- ci/vendir.lock.yml | 8 ++++---- ci/vendir.yml | 4 ++-- ci/vendor/pipeline-fragments.lib.yml | 20 +++++++++++++------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ci/vendir.lock.yml b/ci/vendir.lock.yml index 61e8ac98..6ccd29a5 100644 --- a/ci/vendir.lock.yml +++ b/ci/vendir.lock.yml @@ -2,14 +2,14 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'fix: add repo input to open chart pr task (#39)' - sha: 64581226f53d8bfcca1f96eec1d5e76318f859d9 + commitTitle: 'chore: use kaniko builder in shared build task (#50)' + sha: 3d1a7c11c7967952e84231e39aa5425ad704d93d path: . path: ../.github/workflows/vendor - contents: - git: - commitTitle: 'fix: add repo input to open chart pr task (#39)' - sha: 64581226f53d8bfcca1f96eec1d5e76318f859d9 + commitTitle: 'chore: use kaniko builder in shared build task (#50)' + sha: 3d1a7c11c7967952e84231e39aa5425ad704d93d path: . path: ./vendor kind: LockConfig diff --git a/ci/vendir.yml b/ci/vendir.yml index 15d8e418..b2a9799c 100644 --- a/ci/vendir.yml +++ b/ci/vendir.yml @@ -8,7 +8,7 @@ directories: - path: . # Copy this folder out to .. git: url: https://github.com/GaloyMoney/concourse-shared.git - ref: 64581226f53d8bfcca1f96eec1d5e76318f859d9 + ref: 3d1a7c11c7967952e84231e39aa5425ad704d93d includePaths: - shared/actions/* excludePaths: @@ -20,7 +20,7 @@ directories: - path: . git: url: https://github.com/GaloyMoney/concourse-shared.git - ref: 64581226f53d8bfcca1f96eec1d5e76318f859d9 + ref: 3d1a7c11c7967952e84231e39aa5425ad704d93d includePaths: - shared/ci/**/* excludePaths: diff --git a/ci/vendor/pipeline-fragments.lib.yml b/ci/vendor/pipeline-fragments.lib.yml index 65448131..730836c6 100644 --- a/ci/vendor/pipeline-fragments.lib.yml +++ b/ci/vendor/pipeline-fragments.lib.yml @@ -265,21 +265,27 @@ plan: run: path: pipeline-tasks/ci/vendor/tasks/docker-prep-docker-build-env.sh - task: build - privileged: true config: platform: linux image_resource: type: registry-image source: - repository: vito/oci-build-task + repository: gcr.io/kaniko-project/executor + tag: debug inputs: - name: repo outputs: - name: image - params: - CONTEXT: repo run: - path: build + path: /kaniko/executor + args: + - --dockerfile=Dockerfile + - --context=repo + - --use-new-run + - --single-snapshot + - --cache=false + - --no-push + - --tar-path=image/image.tar - put: edge-image params: image: image/image.tar @@ -478,13 +484,13 @@ source: private_key: #@ data.values.github_private_key #@ end -#@ def versioned_image_resource(): +#@ def versioned_image_resource(publicRepo = True): name: versioned-image type: registry-image source: username: #@ data.values.docker_registry_user password: #@ data.values.docker_registry_password - repository: #@ public_docker_registry() + "/" + data.values.gh_repository + repository: #@ public_docker_registry() + "/" + data.values.gh_repository if publicRepo else private_docker_registry() + "/" + data.values.gh_repository #@ end #@ def gh_release_resource():