diff --git a/.idea/php.xml b/.idea/php.xml index 551fa89..5773c7c 100755 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -213,6 +213,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Dockerfile b/Dockerfile index 8479606..b97df81 100755 --- a/Dockerfile +++ b/Dockerfile @@ -23,11 +23,7 @@ COPY code/ /var/www RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -# Configure Xdebug -#RUN pecl install xdebug -#RUN docker-php-ext-enable xdebug -#COPY docker/php/php.ini /usr/local/etc/php/ -#COPY docker/php/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini +COPY docker/php/php-prod.ini /usr/local/etc/php/ COPY start.sh /home/start.sh diff --git a/DockerfileDevel b/DockerfileDevel index 8479606..469865f 100755 --- a/DockerfileDevel +++ b/DockerfileDevel @@ -24,10 +24,10 @@ COPY code/ /var/www RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer # Configure Xdebug -#RUN pecl install xdebug -#RUN docker-php-ext-enable xdebug -#COPY docker/php/php.ini /usr/local/etc/php/ -#COPY docker/php/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini +RUN pecl install xdebug +RUN docker-php-ext-enable xdebug +COPY docker/php/php.ini /usr/local/etc/php/ +COPY docker/php/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini COPY start.sh /home/start.sh diff --git a/code/storage/database.sqlite b/code/storage/database.sqlite index 55fddab..0153cbc 100755 Binary files a/code/storage/database.sqlite and b/code/storage/database.sqlite differ diff --git a/docker/php/php-prod.ini b/docker/php/php-prod.ini new file mode 100755 index 0000000..86aca9b --- /dev/null +++ b/docker/php/php-prod.ini @@ -0,0 +1,18 @@ +; Enable XDebug +zend_extension = xdebug.so + +; XDebug configuration +xdebug.remote_enable = 1 +xdebug.renite_enable = 1 +xdebug.max_nesting_level = 1000 +xdebug.profiler_enable_trigger = 1 +xdebug.profiler_output_dir = "/var/log" + +; Show PHP errors +display_errors = on + +; Use PHP short tags +short_open_tag = on + +post_max_size = 20M +upload_max_filesize = 20M diff --git a/docker/php/php.ini b/docker/php/php.ini index d766704..86aca9b 100755 --- a/docker/php/php.ini +++ b/docker/php/php.ini @@ -12,4 +12,7 @@ xdebug.profiler_output_dir = "/var/log" display_errors = on ; Use PHP short tags -short_open_tag = on \ No newline at end of file +short_open_tag = on + +post_max_size = 20M +upload_max_filesize = 20M