Skip to content

Commit 1d9b11a

Browse files
authored
[Sync EN] Improve Docker build process, remove --disable-segfault-error (#625)
1 parent ca3109a commit 1d9b11a

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

.docker/Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,11 @@ RUN echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/local.ini
1818

1919
ENV FORMAT=xhtml
2020

21-
CMD php doc-base/configure.php --disable-segfault-error && \
22-
php phd/render.php --docbook doc-base/.manual.xml --output=/var/www/en/output --package PHP --format ${FORMAT}
21+
CMD ["sh", "-c", "\
22+
php doc-base/configure.php && \
23+
exec php phd/render.php \
24+
--docbook doc-base/.manual.xml \
25+
--output=/var/www/en/output \
26+
--package PHP \
27+
--format ${FORMAT}\
28+
"]

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ php: .docker/built
2727

2828
build: .docker/built
2929

30-
.docker/built:
31-
docker build\
32-
--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID}\
30+
.docker/built: .docker/Dockerfile
31+
docker build \
32+
--build-arg UID=${CURRENT_UID} --build-arg GID=${CURRENT_GID} \
3333
.docker -t php/doc-en
3434
touch .docker/built

0 commit comments

Comments
 (0)