From 24aef3b2a88d099cde0041322a8e51c553d35720 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Tue, 28 Nov 2023 16:34:11 +0100 Subject: [PATCH 1/3] Add CircleCI image registry configuration --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e7c074f..176880b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - architect: giantswarm/architect@4.35.1 + architect: giantswarm/architect@4.35.5 jobs: build: @@ -14,7 +14,7 @@ jobs: - setup_remote_docker: version: 20.10.11 - + - architect/push-to-docker: image: quay.io/giantswarm/docs-proxy tag-latest-branch: main From 4928cf9a4253801104b3dfdaf7aef71f43633188 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Wed, 29 Nov 2023 10:22:55 +0100 Subject: [PATCH 2/3] Remove job, use workflow, use orb's push-to-registries job --- .circleci/config.yml | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 176880b..782d7ac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,30 +3,13 @@ version: 2.1 orbs: architect: giantswarm/architect@4.35.5 -jobs: - build: - executor: architect/architect - environment: - DOCKER_BUILDKIT: "1" - - steps: - - checkout - - - setup_remote_docker: - version: 20.10.11 - - - architect/push-to-docker: - image: quay.io/giantswarm/docs-proxy - tag-latest-branch: main - username_envar: QUAY_USERNAME - password_envar: QUAY_PASSWORD - workflows: - package-and-push-chart-on-tag: + build-workflow: jobs: - - build: + - architect/push-to-registries: context: architect - filters: # required since `architect/push-to-app-catalog` has tag filters AND requires `build` + name: push-to-registries + filters: tags: only: /.*/ @@ -36,6 +19,8 @@ workflows: app_catalog: giantswarm-operations-platform-catalog app_catalog_test: giantswarm-operations-platform-test-catalog chart: docs-proxy-app + requires: + - push-to-registries # Trigger job on git tag. filters: tags: From b033df57f658095c3686b2ede3cba7f0ff2133e8 Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Wed, 29 Nov 2023 10:24:22 +0100 Subject: [PATCH 3/3] Fix syntax error --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 782d7ac..f852a1f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ workflows: only: /.*/ - architect/push-to-app-catalog: - name: package and push + name: push-to-app-catalog context: architect app_catalog: giantswarm-operations-platform-catalog app_catalog_test: giantswarm-operations-platform-test-catalog @@ -25,5 +25,3 @@ workflows: filters: tags: only: /^v.*/ - requires: - - build