Update a few minor bits for consistency and proper failure

[tianon]

1. whitespace
2. replace && with ; to ensure set -e Does The Right Thing (see https://www.gnu.org/software/bash/manual/bashref.html#index-set, especially the bit under -e about "part of any command executed in a && or || list except the command following the final && or ||")
3. add a simple warning for 5.5 + MYSQL_ONETIME_PASSWORD (PASSWORD EXPIRE unsupported)

diff --git a/5.7/docker-entrypoint.sh b/5.6/docker-entrypoint.sh
index 025638a..77feab0 100755
--- a/5.7/docker-entrypoint.sh
+++ b/5.6/docker-entrypoint.sh
@@ -21,7 +21,7 @@ if [ "$1" = 'mysqld' ]; then
        chown -R mysql:mysql "$DATADIR"

        echo 'Initializing database'
-       "$@" --initialize-insecure
+       mysql_install_db --user=mysql --datadir="$DATADIR" --rpm --keep-my-cnf
        echo 'Database initialized'

        "$@" --skip-networking &

diff --git a/5.6/docker-entrypoint.sh b/5.5/docker-entrypoint.sh
index 77feab0..1313cd5 100755
--- a/5.6/docker-entrypoint.sh
+++ b/5.5/docker-entrypoint.sh
@@ -21,10 +21,10 @@ if [ "$1" = 'mysqld' ]; then
        chown -R mysql:mysql "$DATADIR"

        echo 'Initializing database'
-       mysql_install_db --user=mysql --datadir="$DATADIR" --rpm --keep-my-cnf
+       mysql_install_db --user=mysql --datadir="$DATADIR" --rpm --basedir=/usr/local/mysql
        echo 'Database initialized'

-       "$@" --skip-networking &
+       "$@" --skip-networking --basedir=/usr/local/mysql &
        pid="$!"

        mysql=( mysql --protocol=socket -uroot )
@@ -93,9 +93,9 @@ if [ "$1" = 'mysqld' ]; then
        done

        if [ ! -z "$MYSQL_ONETIME_PASSWORD" ]; then
-           "${mysql[@]}" <<-EOSQL
-               ALTER USER 'root'@'%' PASSWORD EXPIRE;
-           EOSQL
+           echo >&2
+           echo >&2 'Sorry, this version of MySQL does not support "PASSWORD EXPIRE" (required for MYSQL_ONETIME_PASSWORD).'
+           echo >&2
        fi
        if ! kill -s TERM "$pid" || ! wait "$pid"; then
            echo >&2 'MySQL init process failed.'

cc @ltangvald

[ltangvald]

LGTM :)