From ffe0ad3304275185dfc8b2ce2fe586483fc47456 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 24 May 2025 10:11:30 -0400 Subject: [PATCH] Renaming of some jobs, container registry login, and deploy args. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 9d5f2506..fecfb22f 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -56,14 +56,16 @@ jobs: gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' notification_title: 'GITEA: PR Check' notification_message: 'PR Created 🎟️' - docker-compose-ansible-lints: - name: Docker Compose & Ansible Lints + docker-compose-dry-run: + name: Docker Compose Dry Run needs: [check-and-create-pr] runs-on: ubuntu-latest env: VAULT_ADDR: ${{ secrets.RINOA_VAULT_ADDR }} VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} VAULT_NAMESPACE: "" + outputs: + svc_deploy_list: ${{ steps.detect_services.outputs.classified_services }} steps: - name: Checkout uses: actions/checkout@v4 @@ -282,8 +284,8 @@ jobs: gotify_app_token: '${{ secrets.RINOA_RUNNER_GOTIFY_TOKEN }}' notification_title: 'GITEA: PR Merge Successful' notification_message: 'PR #${{ steps.pr_merge.outputs.pr_index }} merged.' - ansible-config-docker-compose-deploy: - name: Ansible Configs & Docker Compose Deployment + docker-compose-deploy: + name: Docker Compose Deployment runs-on: ubuntu-latest needs: [pr-merge] env: @@ -310,7 +312,7 @@ jobs: - name: Login to Gitea Container Registry uses: docker/login-action@v3 with: - registry: git.trez.wtf + registry: https://git.trez.wtf username: gitea-sonarqube-bot password: ${{ secrets.BOT_GITEA_TOKEN }} - name: Gotify Notification @@ -329,7 +331,7 @@ jobs: uses: keatonLiu/docker-compose-remote-action@v1.2 with: docker_compose_file: docker-compose.yml - docker_args: -d --remove-orphans --pull missing --no-recreate + docker_args: -d --remove-orphans --pull missing ${{ steps.docker-compose-dry-run.outputs.svc_deploy_list }} ssh_user: gitea-deploy ssh_host: 192.168.1.254 ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}