From c4bb7ec6f990b7eb5aa9e838c75b0dbabfd9e974 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Mon, 22 Dec 2025 17:23:09 +0900
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B0=D1=85=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile              | 65 +++++++++++++++++++++++++++++++++++++----
 docker-compose.yml      |  4 ---
 storage/logs/.gitignore |  0
 3 files changed, 59 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 storage/logs/.gitignore

diff --git a/Dockerfile b/Dockerfile
index 0f85fc0..1ba79e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -125,10 +125,63 @@ RUN apt-get update && apt-get install -y \
     cron \
     && rm -rf /var/lib/apt/lists/*
 
+# Установка системных зависимостей
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    wget \
+    unzip \
+    libzip-dev \
+    libxml2-dev \
+    libicu-dev \
+    libonig-dev \
+    libpng-dev \
+    libjpeg-dev \
+    libfreetype6-dev \
+    libwebp-dev \
+    libpq-dev \
+    libxslt1-dev \
+    libexif-dev \
+    libffi-dev \
+    pkg-config \
+    libssl-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Установка PHP расширений
+RUN docker-php-ext-configure gd \
+    --with-freetype \
+    --with-jpeg \
+    --with-webp \
+    && docker-php-ext-install -j$(nproc) \
+    bcmath \
+    intl \
+    mbstring \
+    zip \
+    opcache \
+    pdo \
+    pdo_mysql \
+    pdo_pgsql \
+    gd \
+    exif \
+    sockets \
+    xsl \
+    ffi \
+    pcntl
+
+# Установка Redis расширения
+RUN pecl install redis && docker-php-ext-enable redis
+
+# Настройка opcache для production
+RUN echo "opcache.enable=1" >> /usr/local/etc/php/conf.d/opcache.ini && \
+    echo "opcache.memory_consumption=256" >> /usr/local/etc/php/conf.d/opcache.ini && \
+    echo "opcache.interned_strings_buffer=32" >> /usr/local/etc/php/conf.d/opcache.ini && \
+    echo "opcache.max_accelerated_files=32531" >> /usr/local/etc/php/conf.d/opcache.ini && \
+    echo "opcache.validate_timestamps=0" >> /usr/local/etc/php/conf.d/opcache.ini
+
 # Копируем PHP расширения из первого этапа
-COPY --from=phpbuild /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
-COPY --from=phpbuild /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ /usr/local/lib/php/extensions/no-debug-non-zts-20230831/
-COPY --from=phpbuild /usr/local/bin/ /usr/local/bin/
+#COPY --from=phpbuild /usr/local/etc/php/conf.d/ /usr/local/etc/php/conf.d/
+#COPY --from=phpbuild /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ /usr/local/lib/php/extensions/no-debug-non-zts-20230831/
+#COPY --from=phpbuild /usr/local/bin/ /usr/local/bin/
 
 # Копируем конфигурации
 COPY docker/nginx.conf /etc/nginx/nginx.conf
@@ -138,9 +191,9 @@ COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
 WORKDIR /var/www
 
 # Копируем приложение
-COPY --chown=www:www --from=phpbuild /var/www .
-COPY --chown=www:www --from=jsbuild /var/www/public/build ./public/build
-COPY --chown=www:www --from=jsbuild /var/www/node_modules ./node_modules
+COPY --chown=www-data:www-data --from=phpbuild /var/www .
+COPY --chown=www-data:www-data --from=jsbuild /var/www/public/build ./public/build
+COPY --chown=www-data:www-data --from=jsbuild /var/www/node_modules ./node_modules
 
 # Настройка прав и оптимизация Laravel
 RUN mkdir -p /var/log/supervisor && \
diff --git a/docker-compose.yml b/docker-compose.yml
index d5d278e..adcc801 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,12 +4,8 @@ services:
     image: kartoteka:v1.0
     container_name: kartoteka_app
     restart: unless-stopped
-    tty: true
     ports:
       - "8090:80"
-    environment:
-      SERVICE_NAME: app
-      SERVICE_TAGS: dev
     working_dir: /var/www
     volumes:
       - ./.env:/var/www/.env
diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore
old mode 100644
new mode 100755