Merge branch 'renegade/general-fixes' of github.com:0xRenegade/PHP-Dynamic-Qr-code into renegade/general-fixes
This commit is contained in:
@@ -23,7 +23,6 @@ services:
|
|||||||
DATABASE_NAME: "qrcode"
|
DATABASE_NAME: "qrcode"
|
||||||
DATABASE_USER: "qrcode"
|
DATABASE_USER: "qrcode"
|
||||||
DATABASE_PASSWORD: "changeme"
|
DATABASE_PASSWORD: "changeme"
|
||||||
DATABASE_PREFIX: ""
|
|
||||||
DATABASE_CHARSET: "utf8"
|
DATABASE_CHARSET: "utf8"
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/app/config:/var/www/html/config
|
- ./data/app/config:/var/www/html/config
|
||||||
|
|||||||
@@ -30,6 +30,5 @@ function getDbInstance() {
|
|||||||
'password' => DATABASE_PASSWORD,
|
'password' => DATABASE_PASSWORD,
|
||||||
'db'=> DATABASE_NAME,
|
'db'=> DATABASE_NAME,
|
||||||
'port' => DATABASE_PORT,
|
'port' => DATABASE_PORT,
|
||||||
'prefix' => DATABASE_PREFIX,
|
|
||||||
'charset' => DATABASE_CHARSET));
|
'charset' => DATABASE_CHARSET));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user