Alex Trofimov před 1 rokem
rodič
revize
c90228b56e

+ 13 - 0
docker-compose.yml

@@ -78,6 +78,19 @@ services:
         networks:
             - unanet
 
+    mailpit:
+        image: axllent/mailpit
+        container_name: mailpit
+        restart: unless-stopped
+        ports:
+            - "8025:8025"
+        environment:
+            MP_MAX_MESSAGES: 5000
+            MP_SMTP_AUTH_ACCEPT_ANY: 1
+            MP_SMTP_AUTH_ALLOW_INSECURE: 1
+        networks:
+            - unanet
+
 volumes:
     mysqldata: {}
 

+ 2 - 1
scripts/docker-compose/Cron.Dockerfile

@@ -11,11 +11,12 @@ RUN apt-get update && apt-get install -y \
         libmagickwand-dev \
         libzip-dev \
         unzip \
+        msmtp-mta \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) gd \
     && docker-php-ext-install -j$(nproc) pdo pdo_mysql mysqli \
     && docker-php-ext-install -j$(nproc) zip exif opcache iconv mbstring \
-#    && pecl install xdebug && docker-php-ext-enable xdebug \
+    && pecl install xdebug && docker-php-ext-enable xdebug \
 #    && pecl install mcrypt-1.0.4 && docker-php-ext-enable mcrypt \
     && pecl install imagick-3.8.0 && docker-php-ext-enable imagick
 

+ 1 - 0
scripts/docker-compose/PHP.Dockerfile

@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y \
         libmagickwand-dev \
         libzip-dev \
         unzip \
+        msmtp-mta \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install -j$(nproc) gd \
     && docker-php-ext-install -j$(nproc) pdo pdo_mysql mysqli \

+ 2 - 0
scripts/docker-compose/PHPOpenCV.Dockerfile

@@ -12,6 +12,8 @@ RUN cd /opt/build && make -j4 && ldconfig && make install
 
 RUN apt update && export DEBIAN_FRONTEND=noninteractive && apt install -y software-properties-common && add-apt-repository ppa:ondrej/php && apt update && apt install -y php8.2 php8.2-dev
 
+RUN export DEBIAN_FRONTEND=noninteractive && apt install -y msmtp-mta netcat-traditional iputils-ping
+
 RUN export DEBIAN_FRONTEND=noninteractive && apt install -y php8.2-cli php8.2-fpm php8.2-gd php8.2-curl php8.2-zip php8.2-xml php8.2-mbstring php8.2-mysql php8.2-imagick php8.2-intl
 
 RUN cd /opt && git clone https://github.com/php-opencv/php-opencv.git

+ 7 - 2
scripts/docker-compose/php-cron.ini

@@ -5,8 +5,10 @@ html_errors = On
 error_prepend_string = "<pre style='white-space: pre-line'>"
 error_append_string = "</pre>"
 max_input_vars = 5000
-error_log = /var/log/php.log
+error_log = 
+display_errors = On
 variables_order=GPCSE
+sendmail_path = "/usr/sbin/sendmail --host=mailpit --port=1025 -t -i"
 
 [opcache]
 opcache.enable=1
@@ -19,4 +21,7 @@ opcache.interned_strings_buffer=16
 opcache.fast_shutdown=1
 
 [xdebug]
-xdebug.mode = develop
+xdebug.mode = debug
+xdebug.start_with_request = yes
+xdebug.client_host = host.docker.internal
+

+ 1 - 0
scripts/docker-compose/php.ini

@@ -8,6 +8,7 @@ max_input_vars = 5000
 error_log = 
 display_errors = On
 variables_order=GPCSE
+sendmail_path = "/usr/sbin/sendmail --host=mailpit --port=1025 -t -i"
 
 [opcache]
 opcache.enable=1