Skip to content

Commit

Permalink
Bug#81415 Docker image fails to start with log-bin in config and serv…
Browse files Browse the repository at this point in the history
…er-id on command line

Temporary starting of server did not include command line options, only config file.
Changed to use the same command server is started with after init
  • Loading branch information
ltangvald committed May 26, 2016
1 parent 1fee5fc commit 7e58f0d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion 5.5/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if [ "$1" = 'mysqld' ]; then
mysql_install_db --user=mysql --datadir="$DATADIR" --rpm
echo 'Finished mysql_install_db'

mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
"$@" --skip-networking &
pid="$!"

mysql=( mysql --protocol=socket -uroot )
Expand Down
2 changes: 1 addition & 1 deletion 5.6/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if [ "$1" = 'mysqld' ]; then
mysql_install_db --user=mysql --datadir="$DATADIR" --rpm --keep-my-cnf
echo 'Finished mysql_install_db'

mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
"$@" --skip-networking &
pid="$!"

mysql=( mysql --protocol=socket -uroot )
Expand Down
4 changes: 2 additions & 2 deletions 5.7/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ if [ "$1" = 'mysqld' ]; then
chown -R mysql:mysql "$DATADIR"

echo 'Initializing database'
mysqld --initialize-insecure=on --user=mysql --datadir="$DATADIR"
"$@" --initialize-insecure=on
echo 'Database initialized'

mysqld --user=mysql --datadir="$DATADIR" --skip-networking &
"$@" --skip-networking &
pid="$!"

mysql=( mysql --protocol=socket -uroot )
Expand Down

0 comments on commit 7e58f0d

Please sign in to comment.