From cae134771011c1a2ade76b47053b86a3e6b3d108 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Mon, 16 Jun 2025 10:49:13 -0400 Subject: [PATCH] Adjusting Docker Compose actions. --- .../workflows/pr-cloudflare-docker-deploy.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index 735b8ed9..db0545db 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -144,7 +144,7 @@ jobs: env: DOCKER_HOST: tcp://dockerproxy:2375 with: - docker-flags: -H $DOCKER_HOST + docker-flags: -H "$DOCKER_HOST" services: ${{ needs.generate-service-list.outputs.svc_deploy_list }} up-flags: -d --remove-orphans --dry-run down-flags: --dry-run @@ -333,21 +333,14 @@ jobs: run: | vault kv get -format=json rinoa-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env - name: Docker Compose Deployment - timeout-minutes: 360 - continue-on-error: true - uses: chaplyk/docker-compose-remote-action@v1.1 + uses: hoverkraft-tech/compose-action@v2.2.0 env: DOCKER_HOST: tcp://dockerproxy:2375 with: - ssh_host: 192.168.1.254 - ssh_port: 22 - ssh_user: gitea-deploy - ssh_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }} - service: ${DOCKER_SVC_LIST} - compose_file: docker-compose.yml - pull: false - build: false - options: -d --remove-orphans + docker-flags: -H "$DOCKER_HOST" + services: ${{ needs.generate-service-list.outputs.svc_deploy_list }} + up-flags: -d --remove-orphans + down-flags: --dry-run - name: Gotify Notification uses: eikendev/gotify-action@master with: