diff --git a/firefly_iii/config.json b/firefly_iii/config.json index 7ee8e2c2f..890d3089c 100644 --- a/firefly_iii/config.json +++ b/firefly_iii/config.json @@ -12,8 +12,7 @@ "options": { "DB_CONNECTION": "sqlite", "APP_KEY": "CHANGEME_32_CHARS_EuC5dfn3LAPzeO", - "CONFIG_LOCATION": "/config/addons_config/fireflyiii/config.yaml", - "silent": true + "CONFIG_LOCATION": "/config/addons_config/fireflyiii/config.yaml" }, "ports": { "8080/tcp": 3473 @@ -29,8 +28,7 @@ "DB_PORT": "str?", "DB_DATABASE": "str?", "DB_USERNAME": "str?", - "DB_PASSWORD": "str?", - "silent": "bool" + "DB_PASSWORD": "str?" }, "slug": "fireflyiii", "services": ["mysql:want"], diff --git a/firefly_iii/rootfs/scripts/99-run.sh b/firefly_iii/rootfs/scripts/99-run.sh index ee59feafa..095a3acf5 100644 --- a/firefly_iii/rootfs/scripts/99-run.sh +++ b/firefly_iii/rootfs/scripts/99-run.sh @@ -26,9 +26,9 @@ mariadb_addon) bashio::log.info "Using MariaDB addon. Requirements : running MariaDB addon" if ! bashio::services.available 'mysql'; then bashio::log.fatal \ - "Local database access should be provided by the MariaDB addon" + "Local database access should be provided by the MariaDB addon" bashio::exit.nok \ - "Please ensure it is installed and started" + "Please ensure it is installed and started" fi export DB_CONNECTION=mysql @@ -43,9 +43,9 @@ mariadb_addon) bashio::log.info "Creating database for Firefly-iii if required" mysql \ - -u "${username}" -p"${password}" \ - -h "${host}" -P "${port}" \ - -e "CREATE DATABASE IF NOT EXISTS \`firefly\` ;" + -u "${username}" -p"${password}" \ + -h "${host}" -P "${port}" \ + -e "CREATE DATABASE IF NOT EXISTS \`firefly\` ;" ;; # Use remote @@ -68,8 +68,4 @@ php artisan firefly-iii:upgrade-database # LAUNCH APP # ############## -if bashio::config.true "silent"; then - /./usr/local/bin/entrypoint.sh >/dev/null -else - /./usr/local/bin/entrypoint.sh -fi +/./usr/local/bin/entrypoint.sh