diff --git a/10.11/docker-entrypoint.sh b/10.11/docker-entrypoint.sh index b3ceb0d..20fefd4 100755 --- a/10.11/docker-entrypoint.sh +++ b/10.11/docker-entrypoint.sh @@ -318,7 +318,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -330,7 +330,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -370,7 +370,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -432,7 +432,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -454,7 +454,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/10.4/docker-entrypoint.sh b/10.4/docker-entrypoint.sh index 0fa0570..0253377 100755 --- a/10.4/docker-entrypoint.sh +++ b/10.4/docker-entrypoint.sh @@ -309,7 +309,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION SLAVE ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -321,7 +321,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -361,7 +361,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -423,7 +423,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -445,7 +445,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/10.5/docker-entrypoint.sh b/10.5/docker-entrypoint.sh index 92d242e..0223440 100755 --- a/10.5/docker-entrypoint.sh +++ b/10.5/docker-entrypoint.sh @@ -309,7 +309,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -321,7 +321,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -361,7 +361,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -423,7 +423,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -445,7 +445,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/10.6/docker-entrypoint.sh b/10.6/docker-entrypoint.sh index f04fde6..bb9aef3 100755 --- a/10.6/docker-entrypoint.sh +++ b/10.6/docker-entrypoint.sh @@ -310,7 +310,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -322,7 +322,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -362,7 +362,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -424,7 +424,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -446,7 +446,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/11.0/docker-entrypoint.sh b/11.0/docker-entrypoint.sh index 7fd6847..5c9fc4f 100755 --- a/11.0/docker-entrypoint.sh +++ b/11.0/docker-entrypoint.sh @@ -318,7 +318,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -330,7 +330,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -370,7 +370,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -432,7 +432,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -454,7 +454,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/11.1/docker-entrypoint.sh b/11.1/docker-entrypoint.sh index 7fd6847..5c9fc4f 100755 --- a/11.1/docker-entrypoint.sh +++ b/11.1/docker-entrypoint.sh @@ -318,7 +318,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -330,7 +330,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -370,7 +370,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -432,7 +432,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -454,7 +454,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/11.2/docker-entrypoint.sh b/11.2/docker-entrypoint.sh index 7fd6847..5c9fc4f 100755 --- a/11.2/docker-entrypoint.sh +++ b/11.2/docker-entrypoint.sh @@ -318,7 +318,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -330,7 +330,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -370,7 +370,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -432,7 +432,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -454,7 +454,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/11.3/docker-entrypoint.sh b/11.3/docker-entrypoint.sh index 7fd6847..5c9fc4f 100755 --- a/11.3/docker-entrypoint.sh +++ b/11.3/docker-entrypoint.sh @@ -318,7 +318,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -330,7 +330,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -370,7 +370,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -432,7 +432,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -454,7 +454,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/11.4/docker-entrypoint.sh b/11.4/docker-entrypoint.sh index 7fd6847..5c9fc4f 100755 --- a/11.4/docker-entrypoint.sh +++ b/11.4/docker-entrypoint.sh @@ -318,7 +318,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -330,7 +330,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -370,7 +370,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -432,7 +432,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -454,7 +454,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index e510d50..9bf7623 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -318,7 +318,7 @@ create_replica_user() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") echo "CREATE USER '$MARIADB_REPLICATION_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi echo "GRANT REPLICATION REPLICA ON *.* TO '$MARIADB_REPLICATION_USER'@'%';" @@ -330,7 +330,7 @@ create_healthcheck_users() { local healthCheckConnectPass local healthCheckConnectPassEscaped healthCheckConnectPass="$(pwgen --numerals --capitalize --symbols --remove-chars="=#'\\" -1 32)" - healthCheckConnectPassEscaped=$( docker_sql_escape_string_literal "${healthCheckConnectPass}" ) + healthCheckConnectPassEscaped=$(docker_sql_escape_string_literal "${healthCheckConnectPass}") if [ -n "$MARIADB_HEALTHCHECK_GRANTS" ]; then healthCheckGrant="$MARIADB_HEALTHCHECK_GRANTS" fi @@ -370,7 +370,7 @@ docker_setup_db() { local rootPasswordEscaped= if [ -n "$MARIADB_ROOT_PASSWORD" ]; then # Sets root password and creates root users for non-localhost hosts - rootPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}" ) + rootPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_ROOT_PASSWORD}") fi # default root to listen for connections from anywhere @@ -432,7 +432,7 @@ docker_setup_db() { else # SQL escape the user password, \ followed by ' local userPasswordEscaped - userPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_PASSWORD}" ) + userPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_PASSWORD}") createUser="CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$userPasswordEscaped';" fi @@ -454,7 +454,7 @@ docker_setup_db() { else # on replica local rplPasswordEscaped - rplPasswordEscaped=$( docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}" ) + rplPasswordEscaped=$(docker_sql_escape_string_literal "${MARIADB_REPLICATION_PASSWORD}") # SC cannot follow how MARIADB_MASTER_PORT is assigned a default value. # shellcheck disable=SC2153 changeMasterTo="CHANGE MASTER TO MASTER_HOST='$MARIADB_MASTER_HOST', MASTER_USER='$MARIADB_REPLICATION_USER', MASTER_PASSWORD='$rplPasswordEscaped', MASTER_PORT=$MARIADB_MASTER_PORT, MASTER_CONNECT_RETRY=10;"