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 pull request #861 from n0mer/1.1

Browse Source 
do not evaluate LOGGING_MODE and APP_LOCALE during build phase
This commit is contained in:
Graham Campbell 2015-08-03 12:37:32 +01:00
commit bb71d0175f
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -30,7 +30,7 @@ RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g" /etc/php5/fpm/php-fpm.co
EXPOSE 8000
COPY crontab /etc/cron.d/artisan-schedule
COPY docker/crontab /etc/cron.d/artisan-schedule
RUN chmod 0644 /etc/cron.d/artisan-schedule
RUN touch /var/log/cron.log

2
docker/.env.docker
View File

@ -25,5 +25,3 @@ REDIS_HOST={{REDIS_HOST}}
REDIS_DATABASE={{REDIS_DATABASE}}
REDIS_PORT={{REDIS_PORT}}
LOGGING_MODE={{LOGGING_MODE}}
APP_LOCALE={{APP_LOCALE}}

6
docker/entrypoint.sh
View File

@ -28,9 +28,6 @@ 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
@ -60,9 +57,6 @@ 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