Refactor deployment workflows and enhance Docker configuration management
This commit is contained in:
@@ -4,53 +4,23 @@ on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
stack:
|
||||
description: Stack directory to deploy
|
||||
required: true
|
||||
description: "Stack to deploy (leave empty to reconcile all)"
|
||||
required: false
|
||||
push:
|
||||
paths:
|
||||
- '.gitea/workflows/deploy-cloud-pc.yml'
|
||||
- 'cloud-pc/**'
|
||||
schedule:
|
||||
- cron: '0 4 * * *'
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: cloud-pc
|
||||
steps:
|
||||
- name: Deploy stacks
|
||||
- name: Sync repo
|
||||
run: |
|
||||
set -euxo pipefail
|
||||
cd /opt/services
|
||||
git --version
|
||||
docker version
|
||||
docker compose version
|
||||
git config --global --add safe.directory /opt/services
|
||||
git pull
|
||||
if [ -n "${{ inputs.stack }}" ]; then
|
||||
dirs="${{ inputs.stack }}"
|
||||
else
|
||||
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)"
|
||||
fi
|
||||
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"
|
||||
continue
|
||||
fi
|
||||
cd /opt/services/cloud-pc/$dir
|
||||
test -f docker-compose.yml || { echo "No docker-compose.yml in $dir, skipping"; cd /opt/services; continue; }
|
||||
docker compose config --quiet
|
||||
if grep -qE '^[[:space:]]*build:' docker-compose.yml; then
|
||||
echo "==> Running docker compose up -d --build --remove-orphans for $dir"
|
||||
docker compose up -d --build --remove-orphans
|
||||
else
|
||||
echo "==> Running docker compose pull for $dir"
|
||||
docker compose pull
|
||||
echo "==> Running docker compose up -d --remove-orphans for $dir"
|
||||
docker compose up -d --remove-orphans
|
||||
fi
|
||||
docker compose ps
|
||||
cd /opt/services
|
||||
done
|
||||
git config --global --replace-all safe.directory /opt/services
|
||||
git -C /opt/services pull --ff-only
|
||||
|
||||
- name: Deploy stacks
|
||||
run: /opt/services/scripts/deploy.sh cloud-pc "${{ inputs.stack }}"
|
||||
|
||||
@@ -4,54 +4,23 @@ on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
stack:
|
||||
description: Stack directory to deploy
|
||||
required: true
|
||||
description: "Stack to deploy (leave empty to reconcile all)"
|
||||
required: false
|
||||
push:
|
||||
paths:
|
||||
- '.gitea/workflows/deploy-mini-pc.yml'
|
||||
- 'mini-pc/**'
|
||||
schedule:
|
||||
- cron: '0 4 * * *'
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: mini-pc
|
||||
steps:
|
||||
- name: Deploy stacks
|
||||
- name: Sync repo
|
||||
run: |
|
||||
set -euxo pipefail
|
||||
cd /opt/services
|
||||
git --version
|
||||
docker version
|
||||
docker compose version
|
||||
git config --global --add safe.directory /opt/services
|
||||
git pull
|
||||
if [ -n "${{ inputs.stack }}" ]; then
|
||||
dirs="${{ inputs.stack }}"
|
||||
else
|
||||
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)"
|
||||
fi
|
||||
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"
|
||||
continue
|
||||
fi
|
||||
cd /opt/services/mini-pc/$dir
|
||||
test -f docker-compose.yml || { echo "No docker-compose.yml in $dir, skipping"; cd /opt/services; continue; }
|
||||
docker compose config --quiet
|
||||
if grep -qE '^[[:space:]]*build:' docker-compose.yml; then
|
||||
echo "==> Running docker compose up -d --build --remove-orphans for $dir"
|
||||
docker compose up -d --build --remove-orphans
|
||||
else
|
||||
echo "==> Running docker compose pull for $dir"
|
||||
docker compose pull
|
||||
echo "==> Running docker compose up -d --remove-orphans for $dir"
|
||||
docker compose up -d --remove-orphans
|
||||
fi
|
||||
docker compose ps
|
||||
cd /opt/services
|
||||
done
|
||||
git config --global --replace-all safe.directory /opt/services
|
||||
git -C /opt/services pull --ff-only
|
||||
|
||||
- name: Deploy stacks
|
||||
run: /opt/services/scripts/deploy.sh mini-pc "${{ inputs.stack }}"
|
||||
|
||||
@@ -4,54 +4,23 @@ on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
stack:
|
||||
description: Stack directory to deploy
|
||||
required: true
|
||||
description: "Stack to deploy (leave empty to reconcile all)"
|
||||
required: false
|
||||
push:
|
||||
paths:
|
||||
- '.gitea/workflows/deploy-ru-vps.yml'
|
||||
- 'ru-vps/**'
|
||||
schedule:
|
||||
- cron: '0 4 * * *'
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ru-vps
|
||||
steps:
|
||||
- name: Deploy stacks
|
||||
- name: Sync repo
|
||||
run: |
|
||||
set -euxo pipefail
|
||||
cd /opt/services
|
||||
git --version
|
||||
docker version
|
||||
docker compose version
|
||||
git config --global --add safe.directory /opt/services
|
||||
git pull
|
||||
if [ -n "${{ inputs.stack }}" ]; then
|
||||
dirs="${{ inputs.stack }}"
|
||||
else
|
||||
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)"
|
||||
fi
|
||||
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"
|
||||
continue
|
||||
fi
|
||||
cd /opt/services/ru-vps/$dir
|
||||
test -f docker-compose.yml || { echo "No docker-compose.yml in $dir, skipping"; cd /opt/services; continue; }
|
||||
docker compose config --quiet
|
||||
if grep -qE '^[[:space:]]*build:' docker-compose.yml; then
|
||||
echo "==> Running docker compose up -d --build --remove-orphans for $dir"
|
||||
docker compose up -d --build --remove-orphans
|
||||
else
|
||||
echo "==> Running docker compose pull for $dir"
|
||||
docker compose pull
|
||||
echo "==> Running docker compose up -d --remove-orphans for $dir"
|
||||
docker compose up -d --remove-orphans
|
||||
fi
|
||||
docker compose ps
|
||||
cd /opt/services
|
||||
done
|
||||
git config --global --replace-all safe.directory /opt/services
|
||||
git -C /opt/services pull --ff-only
|
||||
|
||||
- name: Deploy stacks
|
||||
run: /opt/services/scripts/deploy.sh ru-vps "${{ inputs.stack }}"
|
||||
|
||||
Reference in New Issue
Block a user