From a799db63b9382a6030d5c28d6294f1adf48761ee Mon Sep 17 00:00:00 2001 From: lacatoire Date: Thu, 14 May 2026 10:46:46 +0200 Subject: [PATCH] [Sync EN] Improve Docker build process, remove --disable-segfault-error Fixes #614 --- .docker/Dockerfile | 10 ++++++++-- Makefile | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 8f1f3b78b..65c274fe0 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 8464e1a10..2b383207a 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