From 9ccefc8ed3957986c700d2965c435e4f53ea3238 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 24 May 2025 12:41:19 -0400 Subject: [PATCH] Pipeline fixes related to service list outputs. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index fecfb22f..81dc204b 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -65,7 +65,7 @@ jobs: VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }} VAULT_NAMESPACE: "" outputs: - svc_deploy_list: ${{ steps.detect_services.outputs.classified_services }} + svc_deploy_list: ${{ steps.modded_svcs.outputs.rinoa_svcs }} steps: - name: Checkout uses: actions/checkout@v4 @@ -124,13 +124,16 @@ jobs: echo ${mod_svcs} vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env echo "rinoa_svcs=${mod_svcs}" >> "$GITHUB_OUTPUT" + - name: Testing service list output + run: | + echo ${{ steps.modded_svcs.outputs.rinoa_svcs }} - name: Docker Compose Dry Run timeout-minutes: 360 continue-on-error: true uses: keatonLiu/docker-compose-remote-action@v1.2 with: docker_compose_file: docker-compose.yml - docker_args: -d --remove-orphans --pull missing --no-recreate ${{ steps.modded_svcs.rinoa_svcs.output }} + docker_args: -d --remove-orphans --pull missing ${{ steps.modded_svcs.outputs.rinoa_svcs }} ssh_user: gitea-deploy ssh_host: 192.168.1.254 ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }} @@ -331,7 +334,7 @@ jobs: uses: keatonLiu/docker-compose-remote-action@v1.2 with: docker_compose_file: docker-compose.yml - docker_args: -d --remove-orphans --pull missing ${{ steps.docker-compose-dry-run.outputs.svc_deploy_list }} + docker_args: -d --remove-orphans --pull missing ${{ 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 }}