Joders/SkyMoney
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempting to fix frozen deploy step
Some checks failed
Security Tests / security-non-db (push) Successful in 18s
Details
Security Tests / security-db (push) Successful in 22s
Details
Deploy / deploy (push) Failing after 42s
Details

Browse Source
This commit is contained in:
Ricearoni1245
2026-03-02 14:05:52 -06:00
parent cfbda7c3cd
commit 78595a052a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitea/workflows/deploy.yml
View File

@@ -29,6 +29,9 @@ jobs:
run: | run: |
set -euo pipefail set -euo pipefail
# Fail fast if sudo requires interactive password in runner context
sudo -n true
# Deploy directory # Deploy directory
APP_DIR=/opt/skymoney APP_DIR=/opt/skymoney
mkdir -p $APP_DIR mkdir -p $APP_DIR
@@ -57,11 +60,12 @@ jobs:
bash ./scripts/validate-prod-db-target.sh bash ./scripts/validate-prod-db-target.sh
PROD_DB_VOLUME_NAME="${PROD_DB_VOLUME_NAME:-skymoney_pgdata}" \ PROD_DB_VOLUME_NAME="${PROD_DB_VOLUME_NAME:-skymoney_pgdata}" \
ALLOW_EMPTY_PROD_VOLUME="${ALLOW_EMPTY_PROD_VOLUME:-0}" \ ALLOW_EMPTY_PROD_VOLUME="${ALLOW_EMPTY_PROD_VOLUME:-0}" \
DOCKER_CMD="sudo docker" \ PROD_VOLUME_GUARD_TIMEOUT_SEC="${PROD_VOLUME_GUARD_TIMEOUT_SEC:-20}" \
DOCKER_CMD="sudo -n docker" \
bash ./scripts/guard-prod-volume.sh bash ./scripts/guard-prod-volume.sh
# Build and start all services # Build and start all services
sudo docker-compose -p skymoney up -d --build sudo -n docker-compose -p skymoney up -d --build
# Wait for database to be ready # Wait for database to be ready
sleep 10 sleep 10
@@ -76,7 +80,7 @@ jobs:
bash ./scripts/backup.sh bash ./scripts/backup.sh
# Run Prisma migrations inside the API container # Run Prisma migrations inside the API container
sudo docker-compose -p skymoney exec -T api npx prisma migrate deploy sudo -n docker-compose -p skymoney exec -T api npx prisma migrate deploy
- name: Reload Nginx - name: Reload Nginx
run: sudo systemctl reload nginx run: sudo systemctl reload nginx

3
scripts/guard-prod-volume.sh
View File

@@ -4,6 +4,7 @@ set -euo pipefail
VOLUME_NAME="${PROD_DB_VOLUME_NAME:-skymoney_pgdata}" VOLUME_NAME="${PROD_DB_VOLUME_NAME:-skymoney_pgdata}"
ALLOW_EMPTY="${ALLOW_EMPTY_PROD_VOLUME:-0}" ALLOW_EMPTY="${ALLOW_EMPTY_PROD_VOLUME:-0}"
DOCKER_CMD="${DOCKER_CMD:-docker}" DOCKER_CMD="${DOCKER_CMD:-docker}"
PROBE_TIMEOUT_SEC="${PROD_VOLUME_GUARD_TIMEOUT_SEC:-20}"
if ! $DOCKER_CMD volume inspect "$VOLUME_NAME" >/dev/null 2>&1; then if ! $DOCKER_CMD volume inspect "$VOLUME_NAME" >/dev/null 2>&1; then
if [[ "$ALLOW_EMPTY" == "1" ]]; then if [[ "$ALLOW_EMPTY" == "1" ]]; then
@@ -16,7 +17,7 @@ if ! $DOCKER_CMD volume inspect "$VOLUME_NAME" >/dev/null 2>&1; then
exit 1 exit 1
fi fi
if $DOCKER_CMD run --rm -v "${VOLUME_NAME}:/var/lib/postgresql/data" alpine sh -lc "test -f /var/lib/postgresql/data/PG_VERSION"; then if timeout "${PROBE_TIMEOUT_SEC}"s $DOCKER_CMD run --rm -v "${VOLUME_NAME}:/var/lib/postgresql/data" alpine sh -lc "test -f /var/lib/postgresql/data/PG_VERSION"; then
echo "Production volume guard passed: '$VOLUME_NAME' contains PostgreSQL data." echo "Production volume guard passed: '$VOLUME_NAME' contains PostgreSQL data."
exit 0 exit 0
fi fi