From 988a3e8a035e2e1089b07afba20b642af776b3a4 Mon Sep 17 00:00:00 2001
From: maxpozdeev <maxpozdeev@gmail.com>
Date: Mon, 11 Sep 2023 16:05:14 +0300
Subject: [PATCH] updates in dev-docker

---
 docker/dev/_nginx/default.conf                         | 3 ++-
 docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm   | 4 ++--
 docker/dev/mtt-php72-angie-postgres10/php-fpm-www.conf | 1 +
 docker/dev/mtt-php72-apache/php-mtt.ini                | 2 ++
 docker/dev/mtt-php74-apache/compose.yml                | 1 +
 docker/dev/mtt-php82-angie/Dockerfile-fpm              | 8 --------
 docker/dev/mtt-php82-angie/php-fpm-www.conf            | 1 +
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/docker/dev/_nginx/default.conf b/docker/dev/_nginx/default.conf
index d9c1b0b..403e02c 100644
--- a/docker/dev/_nginx/default.conf
+++ b/docker/dev/_nginx/default.conf
@@ -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 {
diff --git a/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm b/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm
index edcf6d7..49c5b6d 100644
--- a/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm
+++ b/docker/dev/mtt-php72-angie-postgres10/Dockerfile-fpm
@@ -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
diff --git a/docker/dev/mtt-php72-angie-postgres10/php-fpm-www.conf b/docker/dev/mtt-php72-angie-postgres10/php-fpm-www.conf
index b162e94..c8c06bd 100644
--- a/docker/dev/mtt-php72-angie-postgres10/php-fpm-www.conf
+++ b/docker/dev/mtt-php72-angie-postgres10/php-fpm-www.conf
@@ -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
diff --git a/docker/dev/mtt-php72-apache/php-mtt.ini b/docker/dev/mtt-php72-apache/php-mtt.ini
index 5503e6a..c6b0ee0 100644
--- a/docker/dev/mtt-php72-apache/php-mtt.ini
+++ b/docker/dev/mtt-php72-apache/php-mtt.ini
@@ -7,3 +7,5 @@ display_errors = On
 display_startup_errors = On
 
 session.gc_divisor = 100
+
+allow_url_fopen=1
diff --git a/docker/dev/mtt-php74-apache/compose.yml b/docker/dev/mtt-php74-apache/compose.yml
index a555071..48dca4f 100644
--- a/docker/dev/mtt-php74-apache/compose.yml
+++ b/docker/dev/mtt-php74-apache/compose.yml
@@ -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
diff --git a/docker/dev/mtt-php82-angie/Dockerfile-fpm b/docker/dev/mtt-php82-angie/Dockerfile-fpm
index b68c07d..b8e178c 100644
--- a/docker/dev/mtt-php82-angie/Dockerfile-fpm
+++ b/docker/dev/mtt-php82-angie/Dockerfile-fpm
@@ -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
diff --git a/docker/dev/mtt-php82-angie/php-fpm-www.conf b/docker/dev/mtt-php82-angie/php-fpm-www.conf
index b162e94..c8c06bd 100644
--- a/docker/dev/mtt-php82-angie/php-fpm-www.conf
+++ b/docker/dev/mtt-php82-angie/php-fpm-www.conf
@@ -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