Skip to content

Commit

Permalink
Update entrypoint.sh
Browse files Browse the repository at this point in the history
TEST BEFORE MERGE Fixes tvelocity#6
  • Loading branch information
JohnMcLear committed May 6, 2015
1 parent 772f477 commit caa707c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions etherpad-lite/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ if [ "$RESULT" != $ETHERPAD_DB_NAME ]; then

mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} -hmysql \
-e "create database ${ETHERPAD_DB_NAME}"

mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} -hmysql \
-e "ALTER DATABASE `${ETHERPAD_DB_NAME}` CHARACTER SET utf8 COLLATE utf8_bin;"

fi

if [ ! -f settings.json ]; then
Expand Down

1 comment on commit caa707c

@dereckson
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend to use CHARACTER SET utf8mb4 COLLATE utf8mb4_bin per https://github.com/ether/etherpad-lite/wiki/How-to-use-Etherpad-Lite-with-MySQL recommendations.

Please sign in to comment.