Update_docker_CI_stage (#23)

* Update_docker_CI_stage * Update_docker_CI_stage * Update_docker_CI_stage * Update_docker_CI_stage
FairwindsOps · May 15, 2024 · fdbaaef · fdbaaef
1 parent 4201867
commit fdbaaef
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,7 +22,7 @@ references:
         mv vault /usr/bin/vault
 
 jobs:
-  prep_vars:
+  prep_vars_and_release:
     working_directory: /home/circleci/src/github.com/fairwindsops/helm-release-pruner
     docker:
       - image: quay.io/reactiveops/ci-images:v14-alpine
@@ -34,25 +34,22 @@ jobs:
       - *install_vault_alpine
       - rok8s-scripts/get_vault_env:
           vault_path: repo/global/env
+      - rok8s-scripts/set_env
+      - rok8s-scripts/docker_login:
+          username: $FAIRWINDS_QUAY_USER
+          password-variable: FAIRWINDS_QUAY_TOKEN
+      - rok8s-scripts/docker_build:
+          config: deploy/build.config
+      - rok8s-scripts/docker_push:
+          config: deploy/build.config
 
 workflows:
   version: 2
   release:
     jobs:
-      - prep_vars:
+      - prep_vars_and_release:
           filters:
             branches:
               ignore: /.*/
             tags:
               only: /.*/
-      - rok8s-scripts/docker_build_and_push:
-          requires:
-            - "prep_vars"
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /.*/
-          password-variable: FAIRWINDS_QUAY_TOKEN
-          registry: quay.io
-          username: fairwinds+circleci