[DOC-CVS] [doc-en] master: Improve Docker build process, remove --disable-segfault-error (#5552)
[email protected] (Jordi Kroon via GitHub) Tue, 12 May 2026 19:19:17 +0000
| Newsgroups | php.doc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Jordi Kroon (jordikroon)
Committer: GitHub (web-flow)
Pusher: cweiske
Date: 2026-05-12T21:19:14+02:00
Commit: https://github.com/php/doc-en/commit/91fd40ca298b6f9463f0737e580b6ae7be231344
Raw diff: https://github.com/php/doc-en/commit/91fd40ca298b6f9463f0737e580b6ae7be231344.diff
Improve Docker build process, remove --disable-segfault-error (#5552)
* Improve Docker build process: remove --disable-segfault-error
* add Dockerfile as a Makefile dependency, so image gets rebuilt when Dockerfile changes
Changed paths:
M .docker/Dockerfile
M Makefile
Diff:
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 8f1f3b78ba94..65c274fe0a1e 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -18,5 +18,11 @@ 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}
+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..0b27d256b8a4 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,8 @@ php: .docker/built
build: .docker/built
-.docker/built:
- docker build\
- --build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID}\
+.docker/built: .docker/Dockerfile
+ docker build \
+ --build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID} \
.docker -t php/doc-en
touch .docker/built