From 7afbcd5395450f54a7f5faf6aa0111cbca031c54 Mon Sep 17 00:00:00 2001 From: shrkz1 Date: Tue, 13 Sep 2022 14:40:10 +0200 Subject: [PATCH 1/3] Minute CRON experiment --- crontab/crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crontab/crontab b/crontab/crontab index 12e0c3c..3d990d4 100644 --- a/crontab/crontab +++ b/crontab/crontab @@ -1,5 +1,5 @@ @hourly export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job hourly >> /var/log/cron.log 2>&1 @daily export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job daily >> /var/log/cron.log 2>&1 @yearly export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job yearly >> /var/log/cron.log 2>&1 -*/10 * * * * export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake queue run -v >> /var/log/cron.log 2>&1 +*/1 * * * * export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake queue run -v >> /var/log/cron.log 2>&1 # remember to end this file with an empty new line From e0a770248d6f2d0e6134eb05a2ceb868f532bff8 Mon Sep 17 00:00:00 2001 From: shrkz1 Date: Tue, 13 Sep 2022 19:10:31 +0200 Subject: [PATCH 2/3] main.env export path correction --- crontab/crontab | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crontab/crontab b/crontab/crontab index 3d990d4..5cb0a7f 100644 --- a/crontab/crontab +++ b/crontab/crontab @@ -1,5 +1,5 @@ -@hourly export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job hourly >> /var/log/cron.log 2>&1 -@daily export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job daily >> /var/log/cron.log 2>&1 -@yearly export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job yearly >> /var/log/cron.log 2>&1 -*/1 * * * * export $(cat /var/www/eramba/app/upgrade/.docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake queue run -v >> /var/log/cron.log 2>&1 +@hourly export $(cat /var/www/eramba/app/upgrade/vendor/eramba/docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job hourly >> /var/log/cron.log 2>&1 +@daily export $(cat /var/www/eramba/app/upgrade/vendor/eramba/docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job daily >> /var/log/cron.log 2>&1 +@yearly export $(cat /var/www/eramba/app/upgrade/vendor/eramba/docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake cron job yearly >> /var/log/cron.log 2>&1 +*/1 * * * * export $(cat /var/www/eramba/app/upgrade/vendor/eramba/docker/main.env) && /bin/sh /var/www/eramba/app/upgrade/bin/cake queue run -v >> /var/log/cron.log 2>&1 # remember to end this file with an empty new line From 2030d79c536f1e2238d4fef568a37c26782e7f17 Mon Sep 17 00:00:00 2001 From: shrkz1 Date: Wed, 5 Oct 2022 15:39:35 +0200 Subject: [PATCH 3/3] entrypoint wokrer removal and some tests --- docker-entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index a47a852..cbcf46e 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -10,7 +10,7 @@ su -s /bin/bash -c "rsync -rv app/upgrade/data_template/ app/upgrade/data/" www- su -s /bin/bash -c "php app/upgrade/bin/cake.php queue worker end all -q" www-data # Lets activate maintenance mode -su -s /bin/bash -c "php app/upgrade/bin/cake.php setup.maintenance_mode activate" www-data +#su -s /bin/bash -c "php app/upgrade/bin/cake.php setup.maintenance_mode activate" www-data # Either load a clean database if eramba is deployed for the first time # or migrate and update to the latest database version if switching to a new/different image, if applicable, @@ -18,9 +18,9 @@ su -s /bin/bash -c "php app/upgrade/bin/cake.php setup.maintenance_mode activate su -s /bin/bash -c "php app/upgrade/bin/cake.php database initialize" www-data # Lets de-activate maintenance mode -su -s /bin/bash -c "php app/upgrade/bin/cake.php setup.maintenance_mode deactivate" www-data +#su -s /bin/bash -c "php app/upgrade/bin/cake.php setup.maintenance_mode deactivate" www-data # Initialize a worker with the deployment so we won't have to wait for the cron to kick in which can take up to 10 minutes. -su -s /bin/bash -c "php app/upgrade/bin/cake.php queue run -v" www-data 2>&1 & +#su -s /bin/bash -c "php app/upgrade/bin/cake.php queue run -v" www-data 2>&1 & exec docker-php-entrypoint "$@"