Merge "Altered create database db statements"

5 files changed, 20 insertions, 9 deletions

diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh b/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh
index d7acfed..a12fd82 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/01-create-camundabpmn.sh
@@ -21,13 +21,13 @@
 # and service marks of AT&T Intellectual Property.
 #
 
-echo "Creating camundabpmn database . . ."
+echo "Creating camundabpmn database . . ." 1>/tmp/mariadb-camundabpmn.log 2>&1
 
-mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
+mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1 
 DROP DATABASE IF EXISTS `camundabpmn`;
 CREATE DATABASE `camundabpmn`;
 DELETE FROM mysql.user WHERE User='camundauser';
-DROP USER 'camundauser';
+DROP USER IF EXISTS 'camundauser';
 CREATE USER 'camundauser';
 GRANT ALL on camundabpmn.* to 'camundauser' identified by 'camunda123' with GRANT OPTION;
 FLUSH PRIVILEGES;
@@ -38,3 +38,4 @@ cd /docker-entrypoint-initdb.d/db-sql-scripts
 mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < mariadb_engine_7.10.0.sql || exit 1
 mysql -uroot -p$MYSQL_ROOT_PASSWORD -f < mariadb_identity_7.10.0.sql || exit 1
 
+echo "Created camundabpmn database . . ." 1>>/tmp/mariadb-camundabpmn.log 2>&1
diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/02-create-requestdb.sh b/volumes/mariadb/docker-entrypoint-initdb.d/02-create-requestdb.sh
index dd51d80..d09ce18 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/02-create-requestdb.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/02-create-requestdb.sh
@@ -21,14 +21,16 @@
 # and service marks of AT&T Intellectual Property.
 #
 
-echo "Creating requestdb database . . ."
+echo "Creating requestdb database . . ." 1>/tmp/mariadb-requestdb.log 2>&1
 
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
 DROP DATABASE IF EXISTS `requestdb`;
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `requestdb` /*!40100 DEFAULT CHARACTER SET latin1 */;
 DELETE FROM mysql.user WHERE User='requestuser';
-DROP USER 'requestuser';
+DROP USER IF EXISTS 'requestuser';
 CREATE USER 'requestuser';
 GRANT ALL on requestdb.* to 'requestuser' identified by 'request123' with GRANT OPTION;
 FLUSH PRIVILEGES;
 EOF
+
+echo "Created requestdb database . . ." 1>>/tmp/mariadb-requestdb.log 2>&1
diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/03-create-catalogdb.sh b/volumes/mariadb/docker-entrypoint-initdb.d/03-create-catalogdb.sh
index aa47f65..4cef914 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/03-create-catalogdb.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/03-create-catalogdb.sh
@@ -21,14 +21,16 @@
 # and service marks of AT&T Intellectual Property.
 #
 
-echo "Creating catalogdb database . . ."
+echo "Creating catalogdb database . . ." 1>/tmp/mariadb-catalogdb.log 2>&1
 
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
 DROP DATABASE IF EXISTS `catalogdb`;
 CREATE DATABASE /*!32312 IF NOT EXISTS*/ `catalogdb` /*!40100 DEFAULT CHARACTER SET latin1 */;
 DELETE FROM mysql.user WHERE User='cataloguser';
-DROP USER 'cataloguser';
+DROP USER IF EXISTS 'cataloguser';
 CREATE USER 'cataloguser';
 GRANT ALL on catalogdb.* to 'cataloguser' identified by 'catalog123' with GRANT OPTION;
 FLUSH PRIVILEGES;
 EOF
+
+echo "Created catalogdb database . . ." 1>>/tmp/mariadb-catalogdb.log 2>&1
\ No newline at end of file
diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/04-create-so-user.sh b/volumes/mariadb/docker-entrypoint-initdb.d/04-create-so-user.sh
index d6d1c20..099d09f 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/04-create-so-user.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/04-create-so-user.sh
@@ -21,10 +21,11 @@
 # and service marks of AT&T Intellectual Property.
 #
 
-echo "Creating so user . . ."
+echo "Creating so user . . ." 1>/tmp/mariadb-so-user.log 2>&1
 
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
 DELETE FROM mysql.user WHERE User='so_user';
+DROP USER IF EXISTS 'so_user';
 CREATE USER 'so_user';
 GRANT USAGE ON *.* TO 'so_user'@'%' IDENTIFIED BY 'so_User123';
 GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE, SHOW VIEW ON `requestdb`.* TO 'so_user'@'%';
@@ -32,3 +33,5 @@ GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE, SHOW VIEW ON `catalogdb`.* TO 'so
 GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE, SHOW VIEW ON `camundabpmn`.* TO 'so_user'@'%';
 FLUSH PRIVILEGES;
 EOF
+
+echo "Created so user . . ." 1>>/tmp/mariadb-so-user.log 2>&1
\ No newline at end of file
diff --git a/volumes/mariadb/docker-entrypoint-initdb.d/05-create-so-admin.sh b/volumes/mariadb/docker-entrypoint-initdb.d/05-create-so-admin.sh
index 6a42d97..3b70d73 100644
--- a/volumes/mariadb/docker-entrypoint-initdb.d/05-create-so-admin.sh
+++ b/volumes/mariadb/docker-entrypoint-initdb.d/05-create-so-admin.sh
@@ -21,10 +21,11 @@
 # and service marks of AT&T Intellectual Property.
 #
 
-echo "Creating so admin user . . ."
+echo "Creating so admin user . . ." 1>/tmp/mariadb-so-admin.log 2>&1
 
 mysql -uroot -p$MYSQL_ROOT_PASSWORD << 'EOF' || exit 1
 DELETE FROM mysql.user WHERE User='so_admin';
+DROP USER IF EXISTS 'so_admin';
 CREATE USER 'so_admin';
 GRANT USAGE ON *.* TO 'so_admin'@'%' IDENTIFIED BY 'so_Admin123';
 GRANT ALL PRIVILEGES ON `camundabpmn`.* TO 'so_admin'@'%' WITH GRANT OPTION;
@@ -32,3 +33,5 @@ GRANT ALL PRIVILEGES ON `requestdb`.* TO 'so_admin'@'%' WITH GRANT OPTION;
 GRANT ALL PRIVILEGES ON `catalogdb`.* TO 'so_admin'@'%' WITH GRANT OPTION;
 FLUSH PRIVILEGES;
 EOF
+
+echo "Created so admin user . . ." 1>>/tmp/mariadb-so-admin.log 2>&1
\ No newline at end of file