Revert "try to run entrypoint as non root user"
This reverts commit 14e3db80b5
.
This commit is contained in:
parent
673773b6bf
commit
f353b75b94
2 changed files with 4 additions and 7 deletions
|
@ -154,14 +154,7 @@ WORKDIR /var/www/dotclear/app
|
|||
|
||||
# Add container starting script
|
||||
ADD docker-entrypoint.sh /entrypoint.sh
|
||||
USER www
|
||||
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
|
||||
HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping || exit 1
|
|
@ -95,4 +95,8 @@ echo >&2 "│ ◦ PHP $(php84 -r "echo PHP_VERSION;")"
|
|||
echo >&2 "│ ◦ Dotclear ${VERSION_INSTALLED}"
|
||||
echo >&2 '└──'
|
||||
|
||||
# Start web server
|
||||
php-fpm84 -D # FPM must start first in daemon mode
|
||||
nginx # Then nginx in no daemon mode
|
||||
|
||||
exec "$@"
|
Loading…
Reference in a new issue