Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker-compose.mysql.yml のバージョンを mysql:8.0 へ更新 #887

Merged
merged 2 commits into from
Apr 16, 2024
Merged

docker-compose.mysql.yml のバージョンを mysql:8.0 へ更新 #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac8187c
docker-compose.mysql.yml のバージョンを mysql:8.0 へ更新
nanasess Apr 9, 2024
f45db89
Merge branch 'master' into improve/mysql8
nanasess Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions eccube_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading