Merge pull request #852 from n0mer/1.1

externalize logging mode and app locale

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'),
 
     /*
     |--------------------------------------------------------------------------

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}}

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
 

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