From 6fdf188052c03b0d96383d37afb84a551122bf25 Mon Sep 17 00:00:00 2001 From: "kirill.khorkov" Date: Sat, 3 Jan 2026 11:55:13 +0300 Subject: [PATCH] =?UTF-8?q?[MVC]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20Docker:=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B0=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0=20?= =?UTF-8?q?=D0=B8=20.dockerignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 21 +++++++++++++++++++++ docker-compose.yml | 2 -- docker/apache/entrypoint.sh | 15 +++++++++------ 3 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..1196b6a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,21 @@ +# Git +.git +.gitignore + +# IDE +.idea +.vscode +*.swp +*.swo + +# OS files +.DS_Store +Thumbs.db + +# Logs +*.log + +# Temporary files +tmp/ +temp/ + diff --git a/docker-compose.yml b/docker-compose.yml index 8dab156..dbb877a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: web: build: diff --git a/docker/apache/entrypoint.sh b/docker/apache/entrypoint.sh index 513dba1..204391e 100644 --- a/docker/apache/entrypoint.sh +++ b/docker/apache/entrypoint.sh @@ -2,16 +2,19 @@ set -e # Включаем mod_rewrite -a2enmod rewrite +a2enmod rewrite 2>/dev/null || true -# Копируем конфигурацию виртуального хоста -cp /etc/apache2/sites-available/vhosts.conf /etc/apache2/sites-enabled/000-default.conf +# Устанавливаем права только на нужные директории, исключая .git +find /var/www/html -maxdepth 1 -type d ! -name '.git' -exec chown -R www-data:www-data {} \; 2>/dev/null || true +find /var/www/html -maxdepth 1 -type f -exec chown www-data:www-data {} \; 2>/dev/null || true -# Устанавливаем права -chown -R www-data:www-data /var/www/html +# Устанавливаем права на ключевые директории +chown -R www-data:www-data /var/www/html/app 2>/dev/null || true +chown -R www-data:www-data /var/www/html/config 2>/dev/null || true +chown -R www-data:www-data /var/www/html/public 2>/dev/null || true +chown -R www-data:www-data /var/www/html/uploads 2>/dev/null || true echo "Apache configured successfully" # Запускаем Apache в foreground режиме exec apache2-foreground -