Merge branch 'master' into renegade/general-fixes

2022-09-23 21:05:16 -05:00
parent 8f053474e7 a8e4cf18ff
commit 1934c78251
3 changed files with 1 additions and 3 deletions
@@ -23,7 +23,6 @@ services:
      DATABASE_NAME: "qrcode"
      DATABASE_USER: "qrcode"
      DATABASE_PASSWORD: "changeme"
-      DATABASE_PREFIX: ""
      DATABASE_CHARSET: "utf8"
    volumes:
      - ./data/app/config:/var/www/html/config
@@ -30,6 +30,5 @@ function getDbInstance() {
        'password' => DATABASE_PASSWORD,
        'db'=> DATABASE_NAME,
        'port' => DATABASE_PORT,
-        'prefix' => DATABASE_PREFIX,
        'charset' => DATABASE_CHARSET));
 }
@@ -33,4 +33,4 @@ if(is_string($docker_cid)) {
 |--------------------------------------------------------------------------
 */

-?>
+?>