diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index b98d59398..469ab1283 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -159,7 +159,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && [ "${USE_DB_ROOT_USER}" == "true" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index 20e78e0da..1044a567c 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -270,7 +270,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && [ "${USE_DB_ROOT_USER}" == "true" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index 20e78e0da..1044a567c 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -270,7 +270,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && [ "${USE_DB_ROOT_USER}" == "true" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index 21008705f..85e7d7881 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -212,7 +212,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && [ "${USE_DB_ROOT_USER}" == "true" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials : ${DB_SERVER_ROOT_USER:=${MYSQL_USER}} diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index fb972d625..9bbcf5b32 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -270,7 +270,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && [ "${USE_DB_ROOT_USER}" == "true" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}} diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index fb972d625..9bbcf5b32 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -270,7 +270,7 @@ check_variables_mysql() { DB_SERVER_ROOT_PASS=${MYSQL_ROOT_PASSWORD:-""} fi - [ -n "${MYSQL_USER}" ] && CREATE_ZBX_DB_USER=true + [ -n "${MYSQL_USER}" ] && [ "${USE_DB_ROOT_USER}" == "true" ] && CREATE_ZBX_DB_USER=true # If root password is not specified use provided credentials DB_SERVER_ROOT_USER=${DB_SERVER_ROOT_USER:-${MYSQL_USER}}