From db2c67747d84077ff3c163b539a504a0cd9190b9 Mon Sep 17 00:00:00 2001 From: bonamin Date: Fri, 27 Feb 2026 05:37:21 +0200 Subject: [PATCH] fix: trying to fix auto-pulls 9 ! --- backend/Dockerfile | 5 +++++ backend/admin/router.py | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index cbffe3c..45b3bd9 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -5,6 +5,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ && curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz \ | tar -xz --strip-components=1 -C /usr/local/bin docker/docker \ + && curl -fsSL "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64" \ + -o /usr/local/bin/docker-compose \ + && chmod +x /usr/local/bin/docker-compose \ + && mkdir -p /usr/local/lib/docker/cli-plugins \ + && ln -s /usr/local/bin/docker-compose /usr/local/lib/docker/cli-plugins/docker-compose \ && rm -rf /var/lib/apt/lists/* WORKDIR /app diff --git a/backend/admin/router.py b/backend/admin/router.py index ed8200c..1dedcc6 100644 --- a/backend/admin/router.py +++ b/backend/admin/router.py @@ -43,7 +43,13 @@ async def deploy(request: Request): logger.info("Auto-deploy triggered via Gitea webhook") project_path = settings.deploy_project_path - cmd = f"git config --global --add safe.directory {project_path} && cd {project_path} && git pull origin main && docker compose up -d --build" + cmd = ( + f"git config --global --add safe.directory {project_path} && " + f"cd {project_path} && " + f"git fetch origin main && " + f"git reset --hard origin/main && " + f"docker-compose up -d --build" + ) try: proc = await asyncio.create_subprocess_shell( cmd,