wait #6360 @0.5

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index e6a1bab9d7703591e499d5e787c302b0ea2bc27f..95eb2f318c802aa48e7507f6265d2362aeb635f7 100644 (file)
--- 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 11b0944ee93c9aae90815475b9cc9b036269f705..406bd2728e227e14ddd5c0a255c0b4ab031ca8bd 100644 (file)
--- 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 c0ef7ab55d13fb9298036ca6c88bd981d6e5df31..929dd39a1b5c48462f085b97b92cbcbb321b6b68 100644 (file)
--- 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 f63c1493d18105f1bb3bbf3e5e7cb22218ccc51e..36e7f5f274f42d1ccfbc399c52d907e8bff9b294 100644 (file)
--- 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 6881a4c2f3ae6a4a1c58eccca770835057c47468..1ea0c737218e2a88de1f952455139cdc4d7ef6c8 100644 (file)
--- 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