Compare commits

..

No commits in common. "7b8202319833fbe98e132a7085111c061969d448" and "499adf4b08b428a47a4a4121f2f9b319f73d91fb" have entirely different histories.

7 changed files with 6 additions and 17 deletions

View File

@ -4,10 +4,10 @@
<option name="directories">
<list>
<option value="$PROJECT_DIR$/app/tests" />
<option value="$PROJECT_DIR$/code/tests/Unit" />
<option value="$PROJECT_DIR$/code/tests/Feature" />
<option value="$PROJECT_DIR$/code-New/tests/Unit" />
<option value="$PROJECT_DIR$/code-New/tests/Feature" />
<option value="$PROJECT_DIR$/code/tests/Unit" />
<option value="$PROJECT_DIR$/code/tests/Feature" />
</list>
</option>
</component>

View File

@ -27,10 +27,6 @@ COPY docker/php/php-prod.ini /usr/local/etc/php/conf.d
COPY start.sh /home/start.sh
ENV TZ=Europe/Moscow
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN printf '[Date]\ndate.timezone="%s"\n', $TZ > /usr/local/etc/php/conf.d/tzone.ini
#nginx
ADD docker/nginx/default.conf /etc/nginx/conf.d/default.conf
COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf

View File

@ -23,10 +23,6 @@ COPY code/ /var/www
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
ENV TZ=Europe/Moscow
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN printf '[Date]\ndate.timezone="%s"\n', $TZ > /usr/local/etc/php/conf.d/tzone.ini
# Configure Xdebug
#RUN pecl install xdebug
#RUN docker-php-ext-enable xdebug

View File

@ -67,7 +67,7 @@ return [
|
*/
'timezone' => 'Europe/Moscow',
'timezone' => 'UTC',
/*
|--------------------------------------------------------------------------

View File

@ -130,9 +130,9 @@ return [
*/
'include_files' => [
//'/var/www/storage/SynologySStoTelegram/**/*.log'
#'/var/www/storage/SynologySStoTelegram/**/*.log'
'/var/www/storage/*/*.log',
//'/var/www/storage/synology/*.log'
'/var/www/storage/synology/*.log'
],
/*
@ -144,7 +144,7 @@ return [
*/
'exclude_files' => [
//'laravel.log'
'laravel.log'
],
/*

Binary file not shown.

View File

@ -1,3 +0,0 @@
<?php
echo date('Y-m-d H:i:s');