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 -