From 5a0d88cdd48bce6379b604662b17c1fc1acea610 Mon Sep 17 00:00:00 2001 From: Last2014 Date: Sat, 1 Nov 2025 11:44:45 +0900 Subject: [PATCH] Chg: Container name / Mig: db volumes / Fix: many (Del: display_startup_errors as php.ini / Add: output_buffering as php.ini / Chg: sql-mode / Add: Dockerfile as MariaDB) --- db/Dockerfile | 3 +++ db/init.sql | 1 - db/my.cnf | 2 +- docker-compose.yml | 10 +++++----- php/php.ini | 5 +---- 5 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 db/Dockerfile diff --git a/db/Dockerfile b/db/Dockerfile new file mode 100644 index 0000000..22c72ca --- /dev/null +++ b/db/Dockerfile @@ -0,0 +1,3 @@ +FROM mariadb:11.3 +COPY my.cnf /etc/mysql/conf.d/mariadb.cnf +COPY init.sql /docker-entrypoint-initdb.d/init.sql diff --git a/db/init.sql b/db/init.sql index e790b0b..86c4a8e 100644 --- a/db/init.sql +++ b/db/init.sql @@ -1,2 +1 @@ CREATE DATABASE uwuzu; - diff --git a/db/my.cnf b/db/my.cnf index 4c28810..2af1750 100644 --- a/db/my.cnf +++ b/db/my.cnf @@ -1,4 +1,4 @@ [mysqld] -sql_mode=NO_ENGINE_SUBSTITUTION +sql-mode = NO_ENGINE_SUBSTITUTION,NO_AUTO_VALUE_ON_ZERO character-set-server = utf8mb4 collation-server = utf8mb4_general_ci diff --git a/docker-compose.yml b/docker-compose.yml index c2b8ee3..9994594 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: build: context: . dockerfile: ./php/Dockerfile - container_name: web + container_name: uwuzu-web ports: - "${PUBLIC_PORT}:80" volumes: @@ -17,8 +17,10 @@ services: - devnet db: - image: mariadb:11.3 - container_name: mariadb + build: + context: ./db + dockerfile: Dockerfile + container_name: uwuzu-db restart: unless-stopped environment: MYSQL_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD} @@ -28,8 +30,6 @@ services: TZ: ${MARIADB_TIME_ZONE} volumes: - db_data:/var/lib/mysql - - ./db/init.sql:/docker-entrypoint-initdb.d/init.sql - - ./db/my.cnf:/etc/mysql/mariadb.conf.d/99-custom.cnf ports: - "${PUBLIC_MARIADB_PORT}:3306" networks: diff --git a/php/php.ini b/php/php.ini index c381fe7..d472d5a 100644 --- a/php/php.ini +++ b/php/php.ini @@ -1,8 +1,5 @@ display_errors = Off -display_startup_errors = Off log_errors = On error_log = /proc/self/fd/2 -error_reporting = E_ALL & ~E_WARNING & ~E_NOTICE -error_prepend_string = -error_append_string = +output_buffering = 4096 default_charset = "UTF-8"