salman/igny8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix webhook to properly sync git repo on push

Browse Source
This commit is contained in:
IGNY8 VPS (Salman)
2025-11-10 12:02:02 +00:00
parent 5833ecc5b7
commit 389ac24230
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
backend/igny8_core/modules/system/views.py
View File

@@ -530,21 +530,42 @@ def gitea_webhook(request):
logger.info(f"[Webhook] Processing push: {commit_count} commit(s) by {pusher} to {repo_full_name}") logger.info(f"[Webhook] Processing push: {commit_count} commit(s) by {pusher} to {repo_full_name}")
# Pull latest code first # Pull latest code - use docker Python library to exec into gitea container
try: try:
import subprocess import docker as docker_lib
logger.info(f"[Webhook] Pulling latest code...") logger.info(f"[Webhook] Pulling latest code...")
result = subprocess.run( client = docker_lib.DockerClient(base_url='unix://var/run/docker.sock')
['/data/app/igny8/scripts/git-pull.sh'], gitea_container = client.containers.get('gitea')
capture_output=True, exec_result = gitea_container.exec_run(
text=True, 'bash -c "git config --global --add safe.directory /deploy/igny8 2>/dev/null || true && '
timeout=30, 'git -C /deploy/igny8 fetch origin main && '
cwd='/data/app/igny8' 'git -C /deploy/igny8 reset --hard origin/main"',
user='root'
) )
if result.returncode == 0: if exec_result.exit_code == 0:
logger.info(f"[Webhook] Git pull successful: {result.stdout}") logger.info(f"[Webhook] Git pull successful")
else: else:
logger.error(f"[Webhook] Git pull failed: {result.stderr}") logger.error(f"[Webhook] Git pull failed: {exec_result.output.decode()}")
except ImportError:
# Fallback to subprocess if docker library not available
try:
import subprocess
logger.info(f"[Webhook] Pulling latest code (subprocess fallback)...")
result = subprocess.run(
['docker', 'exec', 'gitea', 'bash', '-c',
'git config --global --add safe.directory /deploy/igny8 2>/dev/null || true && '
'git -C /deploy/igny8 fetch origin main && '
'git -C /deploy/igny8 reset --hard origin/main'],
capture_output=True,
text=True,
timeout=30
)
if result.returncode == 0:
logger.info(f"[Webhook] Git pull successful")
else:
logger.error(f"[Webhook] Git pull failed: {result.stderr}")
except Exception as e:
logger.error(f"[Webhook] Git pull error: {e}")
except Exception as e: except Exception as e:
logger.error(f"[Webhook] Git pull error: {e}") logger.error(f"[Webhook] Git pull error: {e}")