From 5c4fc3dc2c7241cc4d32cb9ea1bf4b8d890dce06 Mon Sep 17 00:00:00 2001
From: leon <505247370@qq.com>
Date: Tue, 30 Dec 2025 18:11:22 +0800
Subject: [PATCH 1/2] fix: Docker: Add git safe.directory config for
 bind-mounted repos.Mark  /app as safe directory to handle Git 2.35+ ownership
  checks in Docker containers.

---
 dev/docker/entrypoint.app.sh  | 4 ++++
 dev/docker/entrypoint.node.sh | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/dev/docker/entrypoint.app.sh b/dev/docker/entrypoint.app.sh
index b09edda88..5da7c247c 100755
--- a/dev/docker/entrypoint.app.sh
+++ b/dev/docker/entrypoint.app.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Git 2.35+ may refuse to operate on bind-mounted repos with differing ownership ("dubious ownership").
+# Mark /app as safe within the container.
+git config --global --add safe.directory /app 2>/dev/null || true
+
 set -e
 
 env
diff --git a/dev/docker/entrypoint.node.sh b/dev/docker/entrypoint.node.sh
index a8f33fd3d..b8cc0d7fb 100755
--- a/dev/docker/entrypoint.node.sh
+++ b/dev/docker/entrypoint.node.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# Git 2.35+ may refuse to operate on bind-mounted repos with differing ownership ("dubious ownership").
+# Mark /app as safe within the container.
+git config --global --add safe.directory /app 2>/dev/null || true
+
 set -e
 
 npm install

From 018de5def3342f1f1bd62354ffa239ade2d937cd Mon Sep 17 00:00:00 2001
From: leon <505247370@qq.com>
Date: Wed, 31 Dec 2025 13:46:26 +0800
Subject: [PATCH 2/2] fix: Configure safe directory for git in dockerfile

---
 dev/docker/Dockerfile         | 3 +++
 dev/docker/entrypoint.app.sh  | 4 ----
 dev/docker/entrypoint.node.sh | 4 ----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index edab90ca1..b64899f79 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -14,6 +14,9 @@ RUN apt-get update && \
         wait-for-it && \
     rm -rf /var/lib/apt/lists/*
 
+# Mark /app as safe for Git >= 2.35.2
+RUN git config --system --add safe.directory /app
+
 # Install PHP extensions
 RUN docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" && \
     docker-php-ext-configure gd --with-freetype --with-jpeg && \
diff --git a/dev/docker/entrypoint.app.sh b/dev/docker/entrypoint.app.sh
index 5da7c247c..b09edda88 100755
--- a/dev/docker/entrypoint.app.sh
+++ b/dev/docker/entrypoint.app.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# Git 2.35+ may refuse to operate on bind-mounted repos with differing ownership ("dubious ownership").
-# Mark /app as safe within the container.
-git config --global --add safe.directory /app 2>/dev/null || true
-
 set -e
 
 env
diff --git a/dev/docker/entrypoint.node.sh b/dev/docker/entrypoint.node.sh
index b8cc0d7fb..a8f33fd3d 100755
--- a/dev/docker/entrypoint.node.sh
+++ b/dev/docker/entrypoint.node.sh
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-# Git 2.35+ may refuse to operate on bind-mounted repos with differing ownership ("dubious ownership").
-# Mark /app as safe within the container.
-git config --global --add safe.directory /app 2>/dev/null || true
-
 set -e
 
 npm install