summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorFiachra Corcoran <fiachra.corcoran@est.tech>2022-09-26 14:43:13 +0000
committerGerrit Code Review <gerrit@onap.org>2022-09-26 14:43:13 +0000
commitf963f23fdbfc1fc96a47b0660e37efed8f894f2f (patch)
treee8fae0336cc968f5d72740090a87c84e94d86c89 /kubernetes
parenta9735653fa277357628e027cf61dd7b75d966f57 (diff)
parent661a9e4fc01a5cfbfb6dba6a896ac5d32354e9de (diff)
Merge "[COMMON] Fix Portal MariaDB deploy error"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh4
1 files changed, 2 insertions, 2 deletions
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 63d266b75c..709877943c 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 @@ docker_temp_server_start() {
# 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 @@ _main() {
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