[DOC-CVS] [doc-en] master: Change permissions for cloned repositories

[email protected] (Christian Weiske) Thu, 5 Mar 2026 14:26:37 +0000
Newsgroups php.doc.cvs
Message-ID <[email protected]>
Author: Christian Weiske (cweiske)
Date: 2026-03-05T15:24:21+01:00

Commit: https://github.com/php/doc-en/commit/a4bcdd05f1c0eff9ae92e092d9b094bdf35bbbdc
Raw diff: https://github.com/php/doc-en/commit/a4bcdd05f1c0eff9ae92e092d9b094bdf35bbbdc.diff

Change permissions for cloned repositories

The current user and group ID are passed passed to the docker build command
and the ownership of the cloned directories are changed to them.
This gets rid of git's "dubious ownership" error.

Without this changes I got an error:
> $ make
> docker run --rm -v :/var/www/en -w /var/www -u 1000:1000 php/doc-en
> configure.php on PHP 8.2.29, libxml 2.9.14
>
> fatal: detected dubious ownership in repository at '/var/www/doc-base'
> To add an exception for this directory, call:
>
> 	git config --global --add safe.directory /var/www/doc-base
> doc-base/temp clean up FAILED.
> make: *** [Makefile:22: xhtml] Fehler 1

Resolves: https://github.com/php/doc-en/pull/4645

Changed paths:
  M  .docker/Dockerfile
  M  Makefile


Diff:

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 40a9bc44af7c..8f1f3b78ba94 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,4 +1,6 @@
 FROM php:8.2-cli
+ARG UID=1000
+ARG GID=1000
 
 RUN apt-get update && \
     apt-get install -y git default-jre-headless
@@ -9,7 +11,8 @@ ADD https://api.github.com/repos/php/phd/git/refs/heads/master version-phd.json
 ADD https://api.github.com/repos/php/doc-base/git/refs/heads/master version-doc-base.json
 
 RUN git clone --depth 1 https://github.com/php/phd.git &&  \
-    git clone --depth 1 https://github.com/php/doc-base.git
+    git clone --depth 1 https://github.com/php/doc-base.git && \
+    chown -R $UID:$GID phd doc-base
 
 RUN echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/local.ini
 
diff --git a/Makefile b/Makefile
index ae8f8f7faab1..23db8ed335ff 100644
--- a/Makefile
+++ b/Makefile
@@ -28,5 +28,7 @@ php: .docker/built
 build: .docker/built
 
 .docker/built:
-	docker build .docker -t php/doc-en
+	docker build\
+		--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID}\
+		.docker -t php/doc-en
 	touch .docker/built