From 043434bfe818f11ce3a797a38d09796d576c30ff Mon Sep 17 00:00:00 2001 From: Debian Date: Thu, 28 Aug 2025 14:48:08 +0000 Subject: [PATCH] =?UTF-8?q?fix(agents):=20entrypoint=20utilis=C3=A9;=20saf?= =?UTF-8?q?e.directory;=20guard=20diff=20si=20hors=20repo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/agents/run.sh | 6 +++++- scripts/local/run_agents_for_project.sh | 9 +++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/agents/run.sh b/scripts/agents/run.sh index 2ea6615..9b9cf9c 100755 --- a/scripts/agents/run.sh +++ b/scripts/agents/run.sh @@ -87,7 +87,11 @@ pushd "$TARGET_DIR" >/dev/null || true if [[ -s "$after_status_file" ]]; then sed "s/^/ /" "$after_status_file"; else echo " (aucun)"; fi echo echo "## Diff par rapport au dernier commit" - git -C "$TARGET_DIR" diff --name-status || true + if git -C "$TARGET_DIR" rev-parse --is-inside-work-tree >/dev/null 2>&1; then + git -C "$TARGET_DIR" diff --name-status || true + else + echo "(pas un dépôt git, diff ignoré)" + fi } > "$changes_report" popd >/dev/null || true diff --git a/scripts/local/run_agents_for_project.sh b/scripts/local/run_agents_for_project.sh index e73fa50..5070846 100755 --- a/scripts/local/run_agents_for_project.sh +++ b/scripts/local/run_agents_for_project.sh @@ -32,13 +32,14 @@ if [[ -f "$MODULE_LAST_IMAGE_FILE" ]]; then if [[ -f "$HOME/.4nk_template/.env" ]]; then ENV_MOUNT="-v $HOME/.4nk_template/.env:/root/.4nk_template/.env:ro" fi - # Lancer le conteneur en forçant l'entrypoint bash pour appeler run.sh + # Lancer le conteneur en utilisant l'ENTRYPOINT qui configure safe.directory docker run --rm \ + -e RUNNER_MODE=agents \ + -e TARGET_DIR=/work \ + -e OUTPUT_DIR=/work/$OUTPUT_DIR \ -v "$(realpath "$PROJECT_PATH"):/work" \ $ENV_MOUNT \ - --entrypoint bash \ - "$IMAGE_NAME" -lc "cd /work && scripts/agents/run.sh /work /work/$OUTPUT_DIR all" \ - || true + "$IMAGE_NAME" || true else echo "Aucune image de module détectée, fallback docker compose dans 4NK_template" cd "$TEMPLATE_DIR"