From 657ceaf11f50065c0e5584cf08da0f5bec9c3963 Mon Sep 17 00:00:00 2001
From: Janos SUTO <sj@acts.hu>
Date: Sun, 7 Feb 2021 20:33:47 +0100
Subject: [PATCH] Fixed docker start.sh

Signed-off-by: Janos SUTO <sj@acts.hu>
---
 docker/start.sh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/docker/start.sh b/docker/start.sh
index b67d6a92..c5d2393c 100755
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -88,8 +88,8 @@ fix_configs() {
       log "Writing ${PILER_CONF}"
 
       sed \
-         -e "s/mysqluser=.*/${MYSQL_USER}/g" \
-         -e "s/mysqldb=.*/${MYSQL_DATABASE}/g" \
+         -e "s/mysqluser=.*/mysqluser=${MYSQL_USER}/g" \
+         -e "s/mysqldb=.*/mysqldb=${MYSQL_DATABASE}/g" \
          -e "s/verystrongpassword/${MYSQL_PASSWORD}/g" \
          -e "s/hostid=.*/hostid=${PILER_HOSTNAME}/g" \
          -e "s/tls_enable=.*/tls_enable=1/g" \
@@ -138,19 +138,21 @@ wait_until_mysql_server_is_ready() {
 
 
 init_database() {
-   local db
-   local has_piler_db=0
+   local table
+   local has_metadata_table=0
 
    wait_until_mysql_server_is_ready
 
-   while read -r db; do
-      if [[ "$db" == "$MYSQL_DATABASE" ]]; then has_piler_db=1; fi
-   done < <(mysql "--defaults-file=${PILER_MY_CNF}" <<< 'show databases')
+   while read -r table; do
+      if [[ "$table" == metadata ]]; then has_metadata_table=1; fi
+   done < <(mysql "--defaults-file=${PILER_MY_CNF}" "$MYSQL_DATABASE" <<< 'show tables')
+
+   if [[ $has_metadata_table -eq 0 ]]; then
+      log "no metadata table, creating tables"
 
-   if [[ $has_piler_db -eq 0 ]]; then
       mysql "--defaults-file=${PILER_MY_CNF}" "$MYSQL_DATABASE" < /usr/share/piler/db-mysql.sql
    else
-      log "${MYSQL_DATABASE} db exists"
+      log "metadata table exists"
    fi
 
    if [[ -v ADMIN_USER_PASSWORD_HASH ]]; then