updates in dev-docker

This commit is contained in:
maxpozdeev 2023-09-11 16:05:14 +03:00
parent 6958596fb8
commit 988a3e8a03
7 changed files with 9 additions and 11 deletions

View file

@ -1,5 +1,6 @@
# format like 'main' excluding user agent
log_format mtt '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer"';
log_format mtt '$time_local "$request" $status $body_bytes_sent "$http_referer"';
log_format mtt2 '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer"';
access_log off;
upstream fpm {

View file

@ -10,8 +10,8 @@ RUN apk add --update-cache libpq postgresql-dev && \
chmod +x /usr/local/bin/phpunit && \
ln -s html /var/www/src
#COPY php-mtt.ini /usr/local/etc/php/conf.d/
#COPY php-opcache.ini /usr/local/etc/php/conf.d/
COPY php-mtt.ini /usr/local/etc/php/conf.d/
COPY php-opcache.ini /usr/local/etc/php/conf.d/
COPY php-fpm-www.conf /usr/local/etc/php-fpm.d/www.conf
VOLUME /var/www/html

View file

@ -10,3 +10,4 @@ pm.max_spare_servers = 3
pm.max_requests = 500
access.format = "%R - %u [%t] \"%m %r\" %s %f"
access.log = /dev/null

View file

@ -7,3 +7,5 @@ display_errors = On
display_startup_errors = On
session.gc_divisor = 100
allow_url_fopen=1

View file

@ -12,5 +12,6 @@ services:
- MTT_DB_TYPE=sqlite
volumes:
- ../../../src:/var/www/html
- ../../../tests:/var/www/tests
- ./php-mtt.ini:/usr/local/etc/php/conf.d/php-mtt.ini
- ./php-opcache.ini:/usr/local/etc/php/conf.d/php-opcache.ini

View file

@ -10,14 +10,6 @@ RUN apk add --update-cache libpq postgresql-dev icu icu-dev && \
chmod +x /usr/local/bin/phpunit && \
ln -s html /var/www/src
# RUN docker-php-ext-install pdo_mysql && \
# mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
# mkdir /var/www/phpinfo && \
# echo "<?php phpinfo();" > /var/www/phpinfo/phpinfo.php && \
# curl -o /usr/local/bin/phpunit -fL "https://phar.phpunit.de/phpunit-10.phar" && \
# chmod +x /usr/local/bin/phpunit && \
# ln -s html /var/www/src
COPY php-mtt.ini /usr/local/etc/php/conf.d/
COPY php-opcache.ini /usr/local/etc/php/conf.d/
COPY php-fpm-www.conf /usr/local/etc/php-fpm.d/www.conf

View file

@ -10,3 +10,4 @@ pm.max_spare_servers = 3
pm.max_requests = 500
access.format = "%R - %u [%t] \"%m %r\" %s %f"
access.log = /dev/null