Merge branch 'master' into polyfill-php80

nanasess · Dec 18, 2024 · 665a663 · 665a663
2 parents 3f30819 + afe32dd
commit 665a663
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -32,12 +32,13 @@ Pull requestを送信する際は、EC-CUBEのコピーライトポリシーに
 
 #### システム要件
 
-| 分類      | ソフトウェア         | Version                                                                 |
-|-----------|----------------------|-------------------------------------------------------------------------|
-| WebServer | Apache               | 2.4.x or higher<br> (mod_rewrite / mod_ssl 必須)                        |
-| PHP       | PHP                  | 7.4.33 or higher                                                        |
-| Database  | PostgreSQL           | 9.x or higher                                                           |
-| Database  | MySQL                | 5.x / 8.x or higher<br> (InnoDBエンジン 必須)                           |
+| 分類      | ソフトウェア | Version                                                 |
+|-----------|--------------|---------------------------------------------------------|
+| WebServer | Apache       | 2.4.x or higher<br> (mod_rewrite / mod_ssl 必須)        |
+| PHP       | PHP          | 7.4.33 or higher                                        |
+| Database  | PostgreSQL   | 9.x or higher                                           |
+| Database  | MySQL        | 5.x / 8.0.x / 8.4.x or higher<br> (InnoDBエンジン 必須) |
+
 
 ##### 必要な PHP Extensions
 

diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml
@@ -33,8 +33,8 @@ services:
       PASSWORD_HASH_ALGOS: sha256
 
   mysql:
-    image: mysql:8.0
-    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-time-zone=+09:00
+    image: mysql:8.4
+    command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --default-time-zone=+09:00
     ports:
       - '13306:3306'
     volumes:

diff --git a/eccube_install.sh b/eccube_install.sh
@@ -265,9 +265,9 @@ case "${DBTYPE}" in
     fi
     # MySQL
     echo "dropdb..."
-    ${MYSQL} -u ${ROOTUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} -e "DROP DATABASE \`${DBNAME}\`"
+    ${MYSQL} -u ${ROOTUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} -e "DROP DATABASE IF EXISTS \`${DBNAME}\`"
     echo "createdb..."
-    ${MYSQL} -u ${ROOTUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} -e "CREATE DATABASE \`${DBNAME}\` DEFAULT COLLATE=utf8_general_ci;"
+    ${MYSQL} -u ${ROOTUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} -e "CREATE DATABASE \`${DBNAME}\` DEFAULT COLLATE=utf8mb4_general_ci;"
     #echo "grant user..."
     #${MYSQL} -u ${ROOTUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} -e "GRANT ALL ON \`${DBNAME}\`.* TO '${DBUSER}'@'%' IDENTIFIED BY '${DBPASS}'"
     echo "create table..."