Merge "[COMMON] Fix Portal MariaDB deploy error"
diff --git a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
index 63d266b..7098779 100644
--- a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
@@ -110,7 +110,7 @@
# only use the root password if the database has already been initializaed
# so that it won't try to fill in a password file when it hasn't been set yet
extraArgs=""
- if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
+ if [ "$DATABASE_ALREADY_EXISTS" = "false" ]; then
extraArgs=${extraArgs}" --dont-use-mysql-root-password"
fi
if echo 'SELECT 1' |docker_process_sql ${extraArgs} --database=mysql >/dev/null 2>&1; then
@@ -344,7 +344,7 @@
fi
# there's no database, so it needs to be initialized
- if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
+ if [ "$DATABASE_ALREADY_EXISTS" = "false" ]; then
docker_verify_minimum_env
# check dir permissions to reduce likelihood of half-initialized database