Merge pull request #532 from t3h2mas/feature/external-db

Allow for external DB

Author: aaronweaver

entrypoint_scripts/common/dojo-shared-resources.sh

@@ -225,30 +225,45 @@ function ensure_mysql_application_db() {
         stty echo
         read -p "Database name (should NOT exist): " DBNAME
     else
-        # Set the root password for mysql - install has it blank
-        mysql -uroot -e "SET PASSWORD = PASSWORD('Cu3zehoh7eegoogohdoh1the');"
-        # Default values for a automated Docker install
-        echo "Setting default values for MySQL install"
-        SQLHOST="localhost"
-        SQLPORT="3306"
-        SQLUSER="root"
-        SQLPWD="Cu3zehoh7eegoogohdoh1the"
-        DBNAME="dojodb"
+        # Default values for a automated Docker install if not provided
+        echo "Setting values for MySQL install"
+        if [ -z "$SQLHOST" ]; then
+            SQLHOST="localhost"
+        fi
+        if [ -z "$SQLPORT" ]; then
+            SQLPORT="3306"
+        fi
+        if [ -z "$SQLUSER" ]; then
+            SQLUSER="root"
+        fi
+        if [ -z "$SQLPWD" ]; then
+            SQLPWD="Cu3zehoh7eegoogohdoh1the"
+        fi
+        if [ -z "$DBNAME" ]; then
+            DBNAME="dojodb"
+        fi
     fi
 
     if mysql -fs --protocol=TCP -h "$SQLHOST" -P "$SQLPORT" -u"$SQLUSER" -p"$SQLPWD" "$DBNAME" >/dev/null 2>&1 </dev/null; then
         echo "Database $DBNAME already exists!"
         echo
-        read -p "Drop database $DBNAME? [Y/n] " DELETE
+        if [ "$AUTO_DOCKER" == "yes" ]; then
+            if [ -z "$FLUSHDB" ]; then
+                DELETE="yes"
+            else
+                DELETE="$FLUSHDB"
+            fi
+        else
+            read -p "Drop database $DBNAME? [Y/n] " DELETE
+        fi
         if [[ ! $DELETE =~ ^[nN]$ ]]; then
             mysqladmin -f --protocol=TCP --host="$SQLHOST" --port="$SQLPORT" --user="$SQLUSER" --password="$SQLPWD" drop "$DBNAME"
             mysqladmin    --protocol=TCP --host="$SQLHOST" --port="$SQLPORT" --user="$SQLUSER" --password="$SQLPWD" create "$DBNAME"
-        else
-            echo "Error! Must supply an empty database to proceed."
-            echo
-            ensure_mysql_application_db
         fi
     else
+        # Set the root password for mysql - install has it blank
+        mysql -uroot -e "SET PASSWORD = PASSWORD('${SQLPWD}');"
+
         if mysqladmin --protocol=TCP --host="$SQLHOST" --port="$SQLPORT" --user="$SQLUSER" --password="$SQLPWD" create $DBNAME; then
             echo "Created database $DBNAME."
         else