Merge pull request #887 from nanasess/improve/mysql8

docker-compose.mysql.yml のバージョンを mysql:8.0 へ更新
EC-CUBE · Apr 16, 2024 · d2e2694 · d2e2694
2 parents 642b65b + f45db89
commit d2e2694
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml
@@ -35,7 +35,7 @@ services:
       PASSWORD_HASH_ALGOS: sha256
 
   mysql:
-    image: mysql:5.7
+    image: mysql:8.0
     command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-time-zone=+09:00
     ports:
       - '13306:3306'

diff --git a/eccube_install.sh b/eccube_install.sh
@@ -269,16 +269,16 @@ case "${DBTYPE}" in
     #${MYSQL} -u ${ROOTUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} -e "GRANT ALL ON \`${DBNAME}\`.* TO '${DBUSER}'@'%' IDENTIFIED BY '${DBPASS}'"
     echo "create table..."
     echo "SET SESSION default_storage_engine = InnoDB; SET sql_mode = 'NO_ENGINE_SUBSTITUTION';" |
-        cat - ${SQL_DIR}/create_table_mysqli.sql |
+        cat - ${SQL_DIR}/create_table_mysqli.sql | sed -e 's/rank/`rank`/g' |
         ${MYSQL} -h ${DBSERVER} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME}
     echo "insert data..."
     echo "SET CHARACTER SET 'utf8';" |
-        cat - ${SQL_DIR}/insert_data.sql |
+        cat - ${SQL_DIR}/insert_data.sql | sed -e 's/rank/`rank`/g' |
         ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME}
     echo "create sequence table..."
     create_sequence_tables
     echo "execute optional SQL..."
-    get_optional_sql | ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME}
+    get_optional_sql | sed -e 's/rank/`rank`/g' | ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME}
 ;;
 esac