From 13e86f2ee2d3669eb5571df38f00de17dbc0c297 Mon Sep 17 00:00:00 2001
From: Last2014 <info@last2014.com>
Date: Wed, 10 Dec 2025 19:19:14 +0900
Subject: [PATCH] Fix: sql-mode / Many fixes

---
 db/my.cnf          |  2 +-
 docker-compose.yml |  1 -
 php/Dockerfile     | 31 +++++++++++++------------------
 php/apache2.conf   |  4 ++--
 php/entrypoint.sh  | 18 ------------------
 5 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 php/entrypoint.sh

diff --git a/db/my.cnf b/db/my.cnf
index 50f1493..010d462 100644
--- a/db/my.cnf
+++ b/db/my.cnf
@@ -1,5 +1,5 @@
 [mysqld]
-sql-mode = NO_ENGINE_SUBSTITUTION,NO_AUTO_VALUE_ON_ZERO
+sql-mode = NO_ENGINE_SUBSTITUTION
 character-set-server = utf8mb4
 collation-server = utf8mb4_general_ci
 default-storage-engine = InnoDB
diff --git a/docker-compose.yml b/docker-compose.yml
index 9994594..17be398 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,6 @@ services:
       - "${PUBLIC_PORT}:80"
     volumes:
       - app_data:/var/www/html
-      - ./php/php.ini:/usr/local/etc/php/conf.d/99-custom.ini
     environment:
       - APACHE_DOCUMENT_ROOT=/var/www/html
     depends_on:
diff --git a/php/Dockerfile b/php/Dockerfile
index c95b378..eaa9215 100644
--- a/php/Dockerfile
+++ b/php/Dockerfile
@@ -4,6 +4,9 @@ FROM php:8.2-apache
 # Set working directory
 WORKDIR /var/www/html
 
+# Run as root
+USER root
+
 # Install packages(apt)
 RUN apt-get update
 RUN apt-get install -y dos2unix
@@ -20,11 +23,11 @@ RUN apt-get install -y curl
 RUN apt-get clean
 RUN rm -rf /var/lib/apt/lists/*
 
-# Copy uwuzu
-COPY src /usr/src/app
-RUN find /usr/src/app/ -type f -exec dos2unix {} \;
+# Copy app
+COPY src/ /var/www/html/
+RUN find /var/www/html -type f -exec dos2unix {} \;
 
-# Install packages(php)
+# Install PHP extensions
 RUN docker-php-ext-configure gd --with-freetype --with-webp
 RUN docker-php-ext-install gd
 RUN docker-php-ext-install pdo_mysql
@@ -43,18 +46,10 @@ COPY php/php.ini /usr/local/etc/php/conf.d/99-custom.ini
 COPY php/apache2.conf /etc/apache2/conf-enabled/99-custom.conf
 
 # Set permissions
-USER root
-RUN chown -R www-data:www-data /usr/src/app
-RUN find /usr/src/app -type d -exec chmod 775 {} \;
-RUN find /usr/src/app -type f -exec chmod 664 {} \;
-RUN chmod 777 /usr/src/app
+RUN chown -R www-data:www-data /var/www/html
+RUN find /var/www/html -type d -exec chmod 775 {} \;
+RUN find /var/www/html -type f -exec chmod 664 {} \;
+RUN chmod 777 /var/www/html
 
-# Copy entrypoint
-COPY php/entrypoint.sh /usr/src/entrypoint.sh
-RUN chmod +x /usr/src/entrypoint.sh
-
-# Run as www-data
-USER www-data
-
-# Exec entrypoint
-ENTRYPOINT ["/usr/src/entrypoint.sh"]
+# Start Apache
+CMD ["apache2-foreground"]
diff --git a/php/apache2.conf b/php/apache2.conf
index 416f513..44b3fb1 100644
--- a/php/apache2.conf
+++ b/php/apache2.conf
@@ -1,10 +1,10 @@
 <Directory /var/www/html>
     Options Indexes FollowSymLinks
-    AllowOverride All
+    AllowOverride ALL
     Require all granted
 </Directory>
 
 ServerName localhost
 ServerAdmin webmaster@localhost
 DocumentRoot /var/www/html
-
+
diff --git a/php/entrypoint.sh b/php/entrypoint.sh
deleted file mode 100644
index 8c1280a..0000000
--- a/php/entrypoint.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-APP_DIR="/var/www/html"
-SRC_DIR="/usr/src/app"
-INIT_FLAG="$APP_DIR/.initialized"
-
-if [ ! -f "$INIT_FLAG" ]; then
-  echo "[Init] Copying initial files to $APP_DIR..."
-  cp -rT "$SRC_DIR" "$APP_DIR"
-  chown -R www-data:www-data "$APP_DIR"
-  touch "$INIT_FLAG"
-else
-  echo "[Init] Already initialized."
-fi
-
-exec apache2-foreground
-