From 4f3664b3e03b8009e434e77ff6c0a718a2fb9a16 Mon Sep 17 00:00:00 2001 From: Nikolay Gorylenko Date: Sun, 2 Aug 2015 11:15:49 +0200 Subject: [PATCH 1/6] externalize logging mode and app locale --- config/app.php | 4 ++-- docker/.env.docker | 3 +++ docker/entrypoint.sh | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/config/app.php b/config/app.php index 1b31c8ad..0d8a8d98 100644 --- a/config/app.php +++ b/config/app.php @@ -61,7 +61,7 @@ return [ | */ - 'locale' => 'en', + 'locale' => env('APP_LOCALE', 'en'), /* |-------------------------------------------------------------------------- @@ -104,7 +104,7 @@ return [ | */ - 'log' => 'daily', + 'log' => env('LOGGING_MODE', 'daily'), /* |-------------------------------------------------------------------------- diff --git a/docker/.env.docker b/docker/.env.docker index 90c05e30..b28f9a0f 100644 --- a/docker/.env.docker +++ b/docker/.env.docker @@ -24,3 +24,6 @@ MAIL_NAME={{MAIL_NAME}} REDIS_HOST={{REDIS_HOST}} REDIS_DATABASE={{REDIS_DATABASE}} REDIS_PORT={{REDIS_PORT}} + +LOGGING_MODE={{LOGGING_MODE}} +APP_LOCALE={{APP_LOCALE}} diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 0a73b813..5f0de106 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -28,6 +28,9 @@ REDIS_HOST=${REDIS_HOST:-null} REDIS_DATABASE=${REDIS_DATABASE:-null} REDIS_PORT=${REDIS_PORT:-null} +LOGGING_MODE=${LOGGING_MODE:-daily} +APP_LOCALE=${APP_LOCALE:-en} + # configure env file sed 's,{{APP_ENV}},'"${APP_ENV}"',g' -i /var/www/html/.env @@ -57,6 +60,9 @@ sed 's,{{REDIS_HOST}},'"${REDIS_HOST}"',g' -i /var/www/html/.env sed 's,{{REDIS_DATABASE}},'"${REDIS_DATABASE}"',g' -i /var/www/html/.env sed 's,{{REDIS_PORT}},'"${REDIS_PORT}"',g' -i /var/www/html/.env +sed 's,{{LOGGING_MODE}},'"${LOGGING_MODE}"',g' -i /var/www/html/.env +sed 's,{{APP_LOCALE}},'"${APP_LOCALE}"',g' -i /var/www/html/.env + #Clear cache /usr/bin/php composer.phar install --no-dev -o From a4ce37f29abd3eb4710a2a6b8dddd9b7661546de Mon Sep 17 00:00:00 2001 From: Nikolay Gorylenko Date: Sun, 2 Aug 2015 11:55:44 +0200 Subject: [PATCH 2/6] add cron to supervisor --- docker/supervisord.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/supervisord.conf b/docker/supervisord.conf index d0cef069..46b1761b 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -23,3 +23,6 @@ command=/usr/sbin/php5-fpm -c /etc/php5/fpm [program:nginx] command=/usr/sbin/nginx + +[program:cron] +command=/usr/sbin/cron From 3a73a9be5c301f6d4cfafa3b7708921e6597d5d0 Mon Sep 17 00:00:00 2001 From: Nikolay Gorylenko Date: Sun, 2 Aug 2015 12:04:10 +0200 Subject: [PATCH 3/6] add cron config --- Dockerfile | 6 +++++- docker/crontab | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 docker/crontab diff --git a/Dockerfile b/Dockerfile index 2cd61fc2..66f1e9e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,4 +30,8 @@ RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.co EXPOSE 8000 -CMD ["/sbin/entrypoint.sh"] \ No newline at end of file +ADD crontab /etc/cron.d/artisan-schedule +RUN chmod 0644 /etc/cron.d/artisan-schedule +RUN touch /var/log/cron.log + +CMD ["/sbin/entrypoint.sh"] diff --git a/docker/crontab b/docker/crontab new file mode 100644 index 00000000..d41f4aa3 --- /dev/null +++ b/docker/crontab @@ -0,0 +1 @@ +* * * * * php /var/www/html/artisan schedule:run 1>> /dev/null 2>&1 From 60e6d99b95b28a870d28f1464d27025b93ceb635 Mon Sep 17 00:00:00 2001 From: Nikolay Gorylenko Date: Sun, 2 Aug 2015 12:49:15 +0200 Subject: [PATCH 4/6] do not daemonize cron --- docker/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/supervisord.conf b/docker/supervisord.conf index 46b1761b..c3e6f453 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -25,4 +25,4 @@ command=/usr/sbin/php5-fpm -c /etc/php5/fpm command=/usr/sbin/nginx [program:cron] -command=/usr/sbin/cron +command=/usr/sbin/cron -f From 427c8d24a5c9166c844562c272aac44ed86a7838 Mon Sep 17 00:00:00 2001 From: Nikolay Gorylenko Date: Sun, 2 Aug 2015 12:57:12 +0200 Subject: [PATCH 5/6] add user to crontab --- docker/crontab | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/crontab b/docker/crontab index d41f4aa3..1b0fa150 100644 --- a/docker/crontab +++ b/docker/crontab @@ -1 +1,2 @@ -* * * * * php /var/www/html/artisan schedule:run 1>> /dev/null 2>&1 +#minute hour mday month wday who command +* * * * * www-data php /var/www/html/artisan schedule:run 1>> /dev/null 2>&1 From ee7a0ec5f287075bd73efa78ef95468ec48be5fd Mon Sep 17 00:00:00 2001 From: Nikolay Gorylenko Date: Sun, 2 Aug 2015 12:58:28 +0200 Subject: [PATCH 6/6] proper command to add file --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 66f1e9e3..eea72d88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.co EXPOSE 8000 -ADD crontab /etc/cron.d/artisan-schedule +COPY crontab /etc/cron.d/artisan-schedule RUN chmod 0644 /etc/cron.d/artisan-schedule RUN touch /var/log/cron.log