From: Vincent Vanwaelscappel Date: Fri, 6 Oct 2023 07:21:09 +0000 (+0200) Subject: wait #6360 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f6b60e5ac03e88c9184a554273fd72219df7e530;p=pmi.git wait #6360 @0.5 --- diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index e6a1bab..95eb2f3 100644 --- a/.docker/dev/docker-compose.yml +++ b/.docker/dev/docker-compose.yml @@ -38,6 +38,8 @@ services: - './config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml' # Passwords - './config/passwords:/root/passwords' + # Cron + - './config/cron/crontab:/etc/crontab' # PHP - './config/php.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini' # Web path diff --git a/.docker/production/config/cron/crontab b/.docker/production/config/cron/crontab index 11b0944..406bd27 100644 --- a/.docker/production/config/cron/crontab +++ b/.docker/production/config/cron/crontab @@ -1,6 +1 @@ -MAILTO=sysadmin@cubedesigners.com -SHELL=/bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - * * * * * runuser -l pmi -c '/usr/bin/php /application/artisan schedule:run' > /proc/1/fd/1 2>/proc/1/fd/2 -# 20 5 * * * /application/scripts/restartworkers > /proc/1/fd/1 2>/proc/1/fd/2 diff --git a/.docker/production/config/php.ini b/.docker/production/config/php.ini index c0ef7ab..929dd39 100644 --- a/.docker/production/config/php.ini +++ b/.docker/production/config/php.ini @@ -1,4 +1,5 @@ upload_max_filesize = 8G +max_file_uploads = 1000 post_max_size = 8G error_log = /proc/self/fd/2 log_errors = 1 diff --git a/.docker/production/docker-compose.yml b/.docker/production/docker-compose.yml index f63c149..36e7f5f 100644 --- a/.docker/production/docker-compose.yml +++ b/.docker/production/docker-compose.yml @@ -37,6 +37,8 @@ services: - './config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml' # Passwords - './config/passwords:/root/passwords' + # Cron + - './config/cron/crontab:/etc/crontab' # PHP - './config/php.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini' # Web path diff --git a/.docker/production/update b/.docker/production/update index 6881a4c..1ea0c73 100644 --- a/.docker/production/update +++ b/.docker/production/update @@ -1,6 +1,10 @@ #!/bin/sh cd /docker/pmi + chmod -R 777 ./esdata +chown -R 999:999 ./database/data +chown 0:0 ./config/cron/crontab + docker network create pmi COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build