From 29097f94b2609e634403816c5b8630f05843b7da Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 27 May 2026 18:46:44 +0300 Subject: [PATCH] Refactor deployment workflows for cloud-pc, mini-pc, and ru-vps services to improve stack change detection and add a new docker-compose file for v2raya service --- .gitea/workflows/deploy-cloud-pc.yml | 9 +++++++-- .gitea/workflows/deploy-mini-pc.yml | 9 +++++++-- .gitea/workflows/deploy-ru-vps.yml | 9 +++++++-- mini-pc/v2rayA/docker-compose.yml | 10 ++++++++++ 4 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 mini-pc/v2rayA/docker-compose.yml diff --git a/.gitea/workflows/deploy-cloud-pc.yml b/.gitea/workflows/deploy-cloud-pc.yml index 1428670..bc9c291 100644 --- a/.gitea/workflows/deploy-cloud-pc.yml +++ b/.gitea/workflows/deploy-cloud-pc.yml @@ -18,8 +18,13 @@ jobs: docker compose version git config --global --add safe.directory /opt/services git pull - git diff --name-only HEAD~1 HEAD - for dir in $(git diff --name-only HEAD~1 HEAD | grep '^cloud-pc/' | cut -d/ -f2 | sort -u); do + git --no-pager diff --name-only HEAD~1 HEAD + dirs="$(git --no-pager diff --name-only HEAD~1 HEAD | grep '^cloud-pc/' | cut -d/ -f2 | sort -u || true)" + if [ -z "$dirs" ]; then + echo "No changed cloud-pc stacks" + exit 0 + fi + for dir in $dirs; do echo "==> Deploying $dir" if [ "$dir" = "gitea-runner" ]; then echo "Skipping gitea-runner self-update" diff --git a/.gitea/workflows/deploy-mini-pc.yml b/.gitea/workflows/deploy-mini-pc.yml index b9849f9..9e0353b 100644 --- a/.gitea/workflows/deploy-mini-pc.yml +++ b/.gitea/workflows/deploy-mini-pc.yml @@ -19,8 +19,13 @@ jobs: docker compose version git config --global --add safe.directory /opt/services git pull - git diff --name-only HEAD~1 HEAD - for dir in $(git diff --name-only HEAD~1 HEAD | grep '^mini-pc/' | cut -d/ -f2 | sort -u); do + git --no-pager diff --name-only HEAD~1 HEAD + dirs="$(git --no-pager diff --name-only HEAD~1 HEAD | grep '^mini-pc/' | cut -d/ -f2 | sort -u || true)" + if [ -z "$dirs" ]; then + echo "No changed mini-pc stacks" + exit 0 + fi + for dir in $dirs; do echo "==> Deploying $dir" if [ "$dir" = "gitea-runner" ]; then echo "Skipping gitea-runner self-update" diff --git a/.gitea/workflows/deploy-ru-vps.yml b/.gitea/workflows/deploy-ru-vps.yml index 4257ff9..f9b3b97 100644 --- a/.gitea/workflows/deploy-ru-vps.yml +++ b/.gitea/workflows/deploy-ru-vps.yml @@ -19,8 +19,13 @@ jobs: docker compose version git config --global --add safe.directory /opt/services git pull - git diff --name-only HEAD~1 HEAD - for dir in $(git diff --name-only HEAD~1 HEAD | grep '^ru-vps/' | cut -d/ -f2 | sort -u); do + git --no-pager diff --name-only HEAD~1 HEAD + dirs="$(git --no-pager diff --name-only HEAD~1 HEAD | grep '^ru-vps/' | cut -d/ -f2 | sort -u || true)" + if [ -z "$dirs" ]; then + echo "No changed ru-vps stacks" + exit 0 + fi + for dir in $dirs; do echo "==> Deploying $dir" if [ "$dir" = "gitea-runner" ]; then echo "Skipping gitea-runner self-update" diff --git a/mini-pc/v2rayA/docker-compose.yml b/mini-pc/v2rayA/docker-compose.yml new file mode 100644 index 0000000..b6818e6 --- /dev/null +++ b/mini-pc/v2rayA/docker-compose.yml @@ -0,0 +1,10 @@ +services: + v2raya: + image: mzz2017/v2raya:latest + container_name: v2raya + restart: unless-stopped + network_mode: host + environment: + V2RAYA_LOG_FILE: /tmp/v2raya.log + volumes: + - /opt/configs/v2raya:/etc/v2raya \ No newline at end of file