diff --git a/.github/workflows/production_deployment.yml b/.github/workflows/production_deployment.yml index 519aa9e..0bb490f 100644 --- a/.github/workflows/production_deployment.yml +++ b/.github/workflows/production_deployment.yml @@ -16,7 +16,7 @@ jobs: uses: fylein/docker-release-action@master env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} + DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} IMAGE_NAME: fyle_qbd-api - name: Install kustomize @@ -27,26 +27,26 @@ jobs: - name: Clone another repository uses: actions/checkout@v2 with: - repository: ${{ secrets.PROD_DEPLOY_REPO }} + repository: ${{ vars.PROD_DEPLOY_REPO }} ref: master - path: ${{ secrets.PROD_DEPLOY_REPO }} + path: ${{ vars.PROD_DEPLOY_REPO }} persist-credentials: false token: ${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }} - name: Update Image Tag run: | NEW_TAG="v$(git rev-parse --short HEAD)" - cd ${{ secrets.PROD_DEPLOY_REPO }}/${{ secrets.EKS_CLUSTER_NAME }}/integrations + cd ${{ vars.PROD_DEPLOY_REPO }}/${{ vars.PROD_US1_DEPLOY_DIR }}/integrations kustomize edit set image docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_qbd-api=docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_qbd-api:$NEW_TAG - name: Commit and push changes run: | - cd ${{ secrets.PROD_DEPLOY_REPO }}/ + cd ${{ vars.PROD_DEPLOY_REPO }}/ git config --global user.email "integrations@fylehq.com" git config --global user.name "GitHub Actions" git add . git commit -m "Update image tag" - git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ secrets.PROD_DEPLOY_REPO }} + git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ vars.PROD_DEPLOY_REPO }} git pull origin master git push origin master diff --git a/.github/workflows/staging_deployment.yml b/.github/workflows/staging_deployment.yml index b57e1d7..748a7f0 100644 --- a/.github/workflows/staging_deployment.yml +++ b/.github/workflows/staging_deployment.yml @@ -20,7 +20,7 @@ jobs: uses: fylein/docker-release-action@master env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} + DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }} IMAGE_NAME: fyle_qbd-api - name: Install kustomize @@ -30,26 +30,26 @@ jobs: - name: Clone another repository uses: actions/checkout@v2 with: - repository: ${{ secrets.STAGING_DEPLOY_REPO }} + repository: ${{ vars.STAGING_DEPLOY_REPO }} ref: master - path: ${{ secrets.STAGING_DEPLOY_REPO }} + path: ${{ vars.STAGING_DEPLOY_REPO }} persist-credentials: false token: ${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }} - name: Update Image Tag run: | NEW_TAG="v$(git rev-parse --short HEAD)" - cd ${{ secrets.STAGING_DEPLOY_REPO }}/${{ secrets.EKS_CLUSTER_NAME }}/integrations + cd ${{ vars.STAGING_DEPLOY_REPO }}/${{ vars.STAGING_DEPLOY_DIR }}/integrations kustomize edit set image docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_qbd-api=docker.io/${{ secrets.DOCKERHUB_USERNAME }}/fyle_qbd-api:$NEW_TAG - name: Commit and push changes run: | - cd ${{ secrets.STAGING_DEPLOY_REPO }}/ + cd ${{ vars.STAGING_DEPLOY_REPO }}/ git config --global user.email "integrations@fylehq.com" git config --global user.name "GitHub Actions" git add . git commit -m "Update image tag" - git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ secrets.STAGING_DEPLOY_REPO }} + git remote set-url origin https://x-access-token:${{ secrets.DEPLOY_GIT_ACCESS_TOKEN }}@github.com/${{ vars.STAGING_DEPLOY_REPO }} git pull origin master git push origin master