mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-02-13 03:45:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.1'

Browse Source
This commit is contained in:
Graham Campbell 2015-08-02 22:25:08 +01:00
commit e5c6d6af70
6 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -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"]
COPY crontab /etc/cron.d/artisan-schedule
RUN chmod 0644 /etc/cron.d/artisan-schedule
RUN touch /var/log/cron.log
CMD ["/sbin/entrypoint.sh"]

4
config/app.php
View File

@ -61,7 +61,7 @@ return [
|
*/
'locale' => 'en',
'locale' => env('APP_LOCALE', 'en'),
/*
|--------------------------------------------------------------------------
@ -104,7 +104,7 @@ return [
|
*/
'log' => 'daily',
'log' => env('LOGGING_MODE', 'daily'),
/*
|--------------------------------------------------------------------------

3
docker/.env.docker
View File

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

2
docker/crontab Normal file
View File

@ -0,0 +1,2 @@
#minute hour mday month wday who command
* * * * * www-data php /var/www/html/artisan schedule:run 1>> /dev/null 2>&1

6
docker/entrypoint.sh
View File

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

3
docker/supervisord.conf
View File

@ -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 -f