diff --git a/10.10/docker-entrypoint.sh b/10.10/docker-entrypoint.sh index 6f21eac..48cb22c 100755 --- a/10.10/docker-entrypoint.sh +++ b/10.10/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index 6f21eac..48cb22c 100755 --- a/10.11/docker-entrypoint.sh +++ b/10.11/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/10.3/docker-entrypoint.sh b/10.3/docker-entrypoint.sh index e94d5af..a303a74 100755 --- a/10.3/docker-entrypoint.sh +++ b/10.3/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh index e94d5af..a303a74 100755 --- a/10.4/docker-entrypoint.sh +++ b/10.4/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh index e94d5af..a303a74 100755 --- a/10.5/docker-entrypoint.sh +++ b/10.5/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh index 6f21eac..48cb22c 100755 --- a/10.6/docker-entrypoint.sh +++ b/10.6/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/10.7/docker-entrypoint.sh b/10.7/docker-entrypoint.sh index 6f21eac..48cb22c 100755 --- a/10.7/docker-entrypoint.sh +++ b/10.7/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/10.8/docker-entrypoint.sh b/10.8/docker-entrypoint.sh index 6f21eac..48cb22c 100755 --- a/10.8/docker-entrypoint.sh +++ b/10.8/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/10.9/docker-entrypoint.sh b/10.9/docker-entrypoint.sh index 6f21eac..48cb22c 100755 --- a/10.9/docker-entrypoint.sh +++ b/10.9/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by ' diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index e94d5af..a303a74 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -362,7 +362,7 @@ docker_setup_db() { docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MARIADB_DATABASE\` ;" fi - if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then + if [ -n "$MARIADB_PASSWORD" ] || [ -n "$MARIADB_PASSWORD_HASH" ] && [ -n "$MARIADB_USER" ]; then mysql_note "Creating user ${MARIADB_USER}" if [ -n "$MARIADB_PASSWORD" ]; then # SQL escape the user password, \ followed by '