From b66b4f76dfbbc3d63ddf3945968224ed3fac35d4 Mon Sep 17 00:00:00 2001
From: Jordi Kroon <jkroon@onyourmarks.agency>
Date: Tue, 12 May 2026 18:44:48 +0200
Subject: [PATCH 1/2] Improve Docker build process, remove 
 --disable-segfault-error

---
 .docker/Dockerfile | 12 ++++++++++--
 Makefile           | 23 ++++++++++++++---------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 8f1f3b78ba94..d7ca9dc9e9d3 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -18,5 +18,13 @@ RUN echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/local.ini
 
 ENV FORMAT=xhtml
 
-CMD php doc-base/configure.php --disable-segfault-error && \
-    php phd/render.php --docbook doc-base/.manual.xml --output=/var/www/en/output --package PHP --format ${FORMAT}
+ENV FORMAT=xhtml
+
+CMD ["sh", "-c", "\
+php doc-base/configure.php && \
+exec php phd/render.php \
+  --docbook doc-base/.manual.xml \
+  --output=/var/www/en/output \
+  --package PHP \
+  --format ${FORMAT}\
+"]
diff --git a/Makefile b/Makefile
index 23db8ed335ff..aa116b9241f7 100644
--- a/Makefile
+++ b/Makefile
@@ -18,17 +18,22 @@ ifneq ($(wildcard ../phd/LICENSE),)
 	PATHS += -v ${PWD}/../phd:/var/www/phd
 endif
 
-xhtml: .docker/built
+xhtml: docker-build
 	docker run --rm ${PATHS} -w /var/www -u ${CURRENT_UID}:${CURRENT_GID} php/doc-en
 
-php: .docker/built
+php: docker-build
 	docker run --rm ${PATHS} -w /var/www -u ${CURRENT_UID}:${CURRENT_GID} \
 		-e FORMAT=php php/doc-en
 
-build: .docker/built
-
-.docker/built:
-	docker build\
-		--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID}\
-		.docker -t php/doc-en
-	touch .docker/built
+build: docker-build
+
+docker-build:
+	@CURRENT_HASH="$$(sha256sum .docker/Dockerfile | cut -d' ' -f1)"; \
+	if [ ! -f .docker/built ] || [ "$$CURRENT_HASH" != "$$(cat .docker/built)" ]; then \
+		docker build \
+			--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID} \
+			.docker -t php/doc-en; \
+		echo "$$CURRENT_HASH" > .docker/built; \
+	else \
+		echo "Docker image is up to date"; \
+	fi

From 12afe26eb2d2744dfed041b94c435f86db2bf01b Mon Sep 17 00:00:00 2001
From: Jordi Kroon <jkroon@onyourmarks.agency>
Date: Tue, 12 May 2026 21:03:13 +0200
Subject: [PATCH 2/2] remove duplicate ENV and add Dockerfile as a Makefile
 dependency

---
 .docker/Dockerfile |  2 --
 Makefile           | 23 +++++++++--------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index d7ca9dc9e9d3..65c274fe0a1e 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -18,8 +18,6 @@ RUN echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/local.ini
 
 ENV FORMAT=xhtml
 
-ENV FORMAT=xhtml
-
 CMD ["sh", "-c", "\
 php doc-base/configure.php && \
 exec php phd/render.php \
diff --git a/Makefile b/Makefile
index aa116b9241f7..0b27d256b8a4 100644
--- a/Makefile
+++ b/Makefile
@@ -18,22 +18,17 @@ ifneq ($(wildcard ../phd/LICENSE),)
 	PATHS += -v ${PWD}/../phd:/var/www/phd
 endif
 
-xhtml: docker-build
+xhtml: .docker/built
 	docker run --rm ${PATHS} -w /var/www -u ${CURRENT_UID}:${CURRENT_GID} php/doc-en
 
-php: docker-build
+php: .docker/built
 	docker run --rm ${PATHS} -w /var/www -u ${CURRENT_UID}:${CURRENT_GID} \
 		-e FORMAT=php php/doc-en
 
-build: docker-build
-
-docker-build:
-	@CURRENT_HASH="$$(sha256sum .docker/Dockerfile | cut -d' ' -f1)"; \
-	if [ ! -f .docker/built ] || [ "$$CURRENT_HASH" != "$$(cat .docker/built)" ]; then \
-		docker build \
-			--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID} \
-			.docker -t php/doc-en; \
-		echo "$$CURRENT_HASH" > .docker/built; \
-	else \
-		echo "Docker image is up to date"; \
-	fi
+build: .docker/built
+
+.docker/built: .docker/Dockerfile
+	docker build \
+		--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID} \
+		.docker -t php/doc-en
+	touch .docker/built