Merge remote-tracking branch 'origin/master'

# Conflicts: # docker/README.md
2022-08-28 13:22:12 +02:00
parent 08ac31210c a519d7bfe6
commit 389123fe15
11 changed files with 147 additions and 531 deletions
@@ -15,13 +15,16 @@ services:
    ports:
      - "8080:80"
    user: "${PUID}:${PGID}"
-    #environment:
-      #ADMIN_USER: "superadmin" # not supported yet please see road map
-      #ADMIN_PASSWORD: "superadmin" # not supported yet please see road map
-      #DATABASE_HOST: "mariadb" # not supported yet please see road map
-      #DATABASE_NAME: "qrcode" # not supported yet please see road map
-      #DATABASE_USER: "qrcode" # not supported yet please see road map
-      #DATABASE_PASSWORD: "changeme" # not supported yet please see road map
+    environment:
+      ADMIN_USER: "superadmin"
+      ADMIN_PASSWORD: "superadmin"
+      DATABASE_HOST: "mariadb"
+      DATABASE_PORT: "3306"
+      DATABASE_NAME: "qrcode"
+      DATABASE_USER: "qrcode"
+      DATABASE_PASSWORD: "changeme"
+      DATABASE_PREFIX: ""
+      DATABASE_CHARSET: "utf8"
    volumes:
      - ./data/app/config:/var/www/html/config
      - ./data/app/saved_qrcode:/var/www/html/saved_qrcode