merged with v0.10.33
This commit is contained in:
@@ -85,7 +85,7 @@ RUN set -ex; \
|
|||||||
mkdir -p /run/php
|
mkdir -p /run/php
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
CMD ["php-fpm7.4"]
|
CMD ["php-fpm7.4", "--nodaemonize", "-c", "/etc/php/7.4/fpm/php.ini", "--fpm-config", "/etc/php/7.4/fpm/php-fpm.conf"]
|
||||||
|
|
||||||
# Arguments to label built container
|
# Arguments to label built container
|
||||||
ARG VCS_REF
|
ARG VCS_REF
|
||||||
|
|||||||
@@ -267,5 +267,5 @@ if [ -f /var/www/documents/install.lock ]; then
|
|||||||
echo "$image_version" > /var/www/documents/.docker-container-version
|
echo "$image_version" > /var/www/documents/.docker-container-version
|
||||||
fi
|
fi
|
||||||
|
|
||||||
log "Serving Dolibarr..."
|
log "Serving Dolibarr...$@"
|
||||||
exec "$@"
|
exec "$@"
|
||||||
Reference in New Issue
Block a user