dw/docker-dotclear
1
0
Fork 0
Code Issues Pull requests Packages Wiki Activity

Revert "try to run entrypoint as non root user"

Browse source 
This reverts commit 14e3db80b5.
This commit is contained in:
Jean-Christian Denis 2024-12-13 19:04:32 +01:00
parent 673773b6bf
commit f353b75b94
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Dockerfile
View file

@ -154,14 +154,7 @@ WORKDIR /var/www/dotclear/app
# Add container starting script # Add container starting script
ADD docker-entrypoint.sh /entrypoint.sh ADD docker-entrypoint.sh /entrypoint.sh
USER www
ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]
USER root
# FPM must start first in daemon mode
# Then nginx in no daemon mode
SHELL ["/bin/sh", "-c"]
CMD php-fpm84 -D && nginx
# Docker container healthcheck # Docker container healthcheck
HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping || exit 1 HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping || exit 1

4
docker-entrypoint.sh
View file

@ -95,4 +95,8 @@ echo >&2 "│ ◦ PHP $(php84 -r "echo PHP_VERSION;")"
echo >&2 "│ ◦ Dotclear ${VERSION_INSTALLED}" echo >&2 "│ ◦ Dotclear ${VERSION_INSTALLED}"
echo >&2 '└──' echo >&2 '└──'
# Start web server
php-fpm84 -D # FPM must start first in daemon mode
nginx # Then nginx in no daemon mode
exec "$@" exec "$@"