Merge pull request #454 from exussum12/dockerSupport

Add Docker Support

Author: mcneely

scripts/patchdb.sh

@@ -85,7 +85,6 @@ if [ "$DBPORT" != "" ]
 then
     DBCMD="$DBCMD -P$DBPORT"
 fi
-DBCMD="$DBCMD $DBNAME"
 
 ###
 #
@@ -96,7 +95,7 @@ if [ "$INITDB" ]
 then
     PATCH_LEVEL=0
 else
-    PATCH_LEVEL=$($DBCMD -e 'select max(patch_number) as num from patch_history' | grep -v num)
+    PATCH_LEVEL=$($DBCMD $DBNAME -e 'select max(patch_number) as num from patch_history' | grep -v num)
 
     if [ $? -gt 0 ]
     then
@@ -118,13 +117,15 @@ MAX_PATCH_LEVEL=$(ls $PATCH_DIR/patch*.sql | egrep -o 'patch[0-9]*.sql' | egrep
 if [ "$INITDB" ]
 then
     echo -n "Dropping and recreating DB before initialising it..."
-	$($DBCMD -e "drop database $DBNAME; create database $DBNAME;")
+    echo $DBCMD;
+	$($DBCMD -e "drop database if exists $DBNAME; create database $DBNAME;")
     echo -n "Initialising DB..."
-    $($DBCMD < $PATCH_DIR/init_db.sql)
-    $($DBCMD < $PATCH_DIR/init_data.sql)
+    $($DBCMD $DBNAME < $PATCH_DIR/init_db.sql)
+    $($DBCMD $DBNAME < $PATCH_DIR/init_data.sql)
     echo " Ok"
 fi
 
+DBCMD="$DBCMD $DBNAME"
 
 for ((i=$(($PATCH_LEVEL + 1)); i <= $(($MAX_PATCH_LEVEL)); i++));
 do

src/database.php.dist

@@ -51,9 +51,9 @@ if (! defined('BASEPATH')) {
 $active_group  = "default";
 $active_record = true;
 
-$db['default']['hostname'] = "localhost";
-$db['default']['username'] = "joind_in";
-$db['default']['password'] = "pleasechangeme";
+$db['default']['hostname'] = getenv('MYSQL_HOST') ?: "localhost";
+$db['default']['username'] = getenv('MYSQL_USER') ?: "joindin";
+$db['default']['password'] = getenv('MYSQL_PASSWORD') ?: "password";
 $db['default']['database'] = "joindin";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";

src/public/index.php

@@ -6,7 +6,9 @@
 if (!function_exists('apache_request_headers')) {
     include '../inc/nginx-helper.php';
 }
-
+if(!ini_get('date.timezone')) {
+    date_default_timezone_set('UTC');
+}
 // Add exception handler
 function handle_exception($e)
 {