fix Dockerfile, docker-compose.yml and other docker files to improve docker build and configure xdebug

NONstop5 · NONstop5 · commit 83a10e81a9c3 · 2025-04-14T05:39:57.000+03:00
diff --git a/.dockerignore b/.dockerignore
diff --git a/.env b/.env
@@ -40,6 +40,8 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
 MAILER_DSN=null://null
 ###< symfony/mailer ###
 
-# Настройки Xdebug
-XDEBUG_CLIENT_HOST=host.docker.internal
-XDEBUG_IDEKEY=PHPSTORM
+###> redis ###
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6379
+REDIS_DB=0
+###< redis ###
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 ## IndigoLab test project
 
 ### Requirements
-- PHP >= 8.4
+- PHP >= 8.3
 - Composer >= 2
 - Make >= 4
 - Docker
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,68 +1,88 @@
 version: '3.8'
 
 services:
-    ilyaguev_igor-indigolab-php:
+    app:
         build:
             context: .
-            dockerfile: ./docker/php/Dockerfile
-        container_name: ilyaguev_igor-indigolab-php
+            dockerfile: docker/php/Dockerfile
+            args:
+                UID: ${UID}
+                GID: ${GID}
+                APP_ENV: ${APP_ENV}
+        container_name: "${PROJECT_NAME}-app"
         restart: unless-stopped
-        volumes:
-            - .:/var/www/html
+        user: "${UID:-1000}:${GID:-1000}"
+        working_dir: /var/www/html
         environment:
-            - DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@ilyaguev_igor-indigolab-postgres:5432/${POSTGRES_DB}
-            - REDIS_URL=redis://ilyaguev_igor-indigolab-redis:6379
-#            - XDEBUG_CLIENT_HOST=${XDEBUG_CLIENT_HOST}
-#            - XDEBUG_IDEKEY=${XDEBUG_IDEKEY}
+            APP_ENV: ${APP_ENV}
+            APP_DEBUG: ${APP_DEBUG}
+            DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${PROJECT_NAME}-postgres:${POSTGRES_PORT}/${POSTGRES_DB}
+            REDIS_URL: redis://${PROJECT_NAME}-redis:${REDIS_PORT}
+            XDEBUG_MODE: ${XDEBUG_MODE:-off}
+            XDEBUG_TRIGGER: ${XDEBUG_TRIGGER:-TRIGGER}
+            XDEBUG_CONFIG: "client_host=${XDEBUG_HOST:-host.docker.internal} discover_client_host=1 log=/var/log/xdebug/xdebug.log"
+            PHP_IDE_CONFIG: "serverName=Docker"
+            TZ: ${TZ}
+        volumes:
+            - ./:/var/www/html
         depends_on:
-            - ilyaguev_igor-indigolab-postgres
-            - ilyaguev_igor-indigolab-redis
+            - db
+            - redis
         networks:
-            - indigolab-network
+            - app-network
 
-    ilyaguev_igor-indigolab-nginx:
-        image: nginx:latest
-        container_name: ilyaguev_igor-indigolab-nginx
+    nginx:
+        image: nginx:1.25-alpine
+        container_name: "${PROJECT_NAME}-nginx"
         restart: unless-stopped
         ports:
             - "${HTTP_PORT}:80"
+            - "${HTTPS_PORT}:443"
         volumes:
             - ./docker/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
             - ./public:/var/www/html/public
         depends_on:
-            - ilyaguev_igor-indigolab-php
+            - app
         networks:
-            - indigolab-network
+            - app-network
 
-    ilyaguev_igor-indigolab-postgres:
-        image: postgres:latest
-        container_name: ilyaguev_igor-indigolab-postgres
+    db:
+        image: postgres:16
+        container_name: "${PROJECT_NAME}-postgres"
         restart: unless-stopped
         environment:
             POSTGRES_DB: ${POSTGRES_DB}
             POSTGRES_USER: ${POSTGRES_USER}
             POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
             POSTGRES_ROOT_PASSWORD: ${POSTGRES_ROOT_PASSWORD}
-            TZ: "Europe/Moscow"
+            TZ: ${TZ}
         ports:
             - "${POSTGRES_PORT}:5432"
         volumes:
-            - ./docker/pgdata:/var/lib/postgresql/data
+            - pgdata:/var/lib/postgresql/data
+        healthcheck:
+            test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}" ]
+            interval: 5s
+            timeout: 5s
+            retries: 5
         networks:
-            - indigolab-network
+            - app-network
 
-    ilyaguev_igor-indigolab-redis:
-        image: redis:latest
-        container_name: ilyaguev_igor-indigolab-redis
+    redis:
+        image: redis:7-alpine
+        container_name: "${PROJECT_NAME}-redis"
         restart: unless-stopped
+        environment:
+            REDIS_PASSWORD: ${REDIS_PASSWORD}
+            TZ: ${TZ}
         ports:
-            - "6379:6379"
+            - "${REDIS_PORT}:6379"
         networks:
-            - indigolab-network
+            - app-network
 
 volumes:
-    postgres_data:
+    pgdata:
 
 networks:
-    indigolab-network:
+    app-network:
         driver: bridge
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -1,42 +1,69 @@
 FROM php:8.3-fpm
 
+# Устанавливаем пользователя/группу из аргументов
+ARG UID=${UID}
+ARG GID=${GID}
+ARG APP_ENV=${APP_ENV}
+
 # Устанавливаем необходимые зависимости
 RUN apt-get update && apt-get install -y \
-    git \
-    libmcrypt-dev \
+    bash-completion \
     libzip-dev \
     libpq-dev \
+    libicu-dev \
+    unzip \
+    curl \
     zip \
-    && rm -rf /var/lib/apt/lists/*
+    git
+
+# Расширения PHP
+RUN docker-php-ext-install zip pdo pdo_mysql pdo_pgsql
+
+# Алиасы и автодополнение
+RUN echo "alias ll='ls -alF'" >> /etc/bash.bashrc
+RUN echo 'source /etc/bash_completion' >> /etc/bash.bashrc
 
-# Устанавливаем расширения PHP
-RUN docker-php-ext-install zip pdo pdo_pgsql
+# Пользователь и права
+RUN groupmod -g ${GID} www-data && \
+    usermod -u ${UID} www-data && \
+    chown -R ${UID}:${GID} /var/www/html
 
-# Настройка PHP
-COPY docker/php/php.ini /usr/local/etc/php/conf.d/
+# Логи Xdebug (только для dev)
+RUN if [ "$APP_ENV" = "dev" ]; then \
+    mkdir -p /var/log/xdebug && \
+    chown -R ${UID}:${GID} /var/log/xdebug && \
+    chmod -R 766 /var/log/xdebug; \
+    fi
+
+# Конфиги PHP
+COPY docker/php/conf.d/php.ini /usr/local/etc/php/conf.d/
+COPY docker/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
 # Устанавливаем Composer
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
     && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
     && php -r "unlink('composer-setup.php');"
 
-# Устанавливаем Xdebug
-RUN pecl install xdebug && docker-php-ext-enable xdebug
-
-# Копируем конфигурацию Xdebug
-#COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
+# Xdebug (только для dev)
+RUN if [ "$APP_ENV" = "dev" ]; then \
+    pecl install xdebug && \
+    docker-php-ext-enable xdebug && \
+    pecl clear-cache \
+    rm -rf /tmp/pear; \
+    fi
 
 # Устанавливаем рабочую директорию
 WORKDIR /var/www/html
 
-# Копируем весь исходный код
-COPY . /var/www/html
+# Копируем все файлы
+COPY . .
 
-# Устанавливаем зависимости Composer
-RUN composer install
+# Устанавливаем зависимости
+RUN if [ "$APP_ENV" = "prod" ]; then \
+    composer install --no-dev --optimize-autoloader --no-interaction --prefer-dist; \
+    else \
+    composer install --no-interaction --prefer-dist; \
+    fi
 
 # Указываем пользователя для выполнения команд
-USER www-data
-
-# Права для веб-сервера
-#RUN chown -R www-data:www-data /var/www/html/var
+USER ${UID}:${GID}
diff --git a/docker/php/conf.d/php.ini b/docker/php/conf.d/php.ini
@@ -1,4 +1,4 @@
-date.timezone = ${TZ}
+date.timezone = Europe/Moscow
 short_open_tag = Off
 log_errors = On
 error_reporting = E_ALL
diff --git a/docker/php/conf.d/xdebug.ini b/docker/php/conf.d/xdebug.ini
@@ -1,4 +1,6 @@
-zend_extension=xdebug.so
-xdebug.mode=develop,debug
-xdebug.client_host=${XDEBUG_CLIENT_HOST}
-xdebug.idekey=${XDEBUG_IDEKEY}
+zend_extension=xdebug
+
+[xdebug]
+xdebug.start_with_request = trigger
+xdebug.discover_client_host = 0
+xdebug.idekey=PHPSTORM

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-date.timezone = ${TZ}`
	`1`	`+date.timezone = Europe/Moscow`
`2`	`2`	`short_open_tag = Off`
`3`	`3`	`log_errors = On`
`4`	`4`	`error_reporting = E_ALL`