diff --git a/grocy/Dockerfile b/grocy/Dockerfile index 48903c6..85b03de 100755 --- a/grocy/Dockerfile +++ b/grocy/Dockerfile @@ -29,7 +29,7 @@ RUN \ \ && yarn global add modclean \ \ - && git clone --branch "v2.5.2" --depth=1 \ + && git clone --branch "v2.6.0" --depth=1 \ https://github.com/grocy/grocy.git /var/www/grocy \ \ && cd /var/www/grocy \ diff --git a/grocy/config.json b/grocy/config.json index b16bd97..1890719 100755 --- a/grocy/config.json +++ b/grocy/config.json @@ -9,19 +9,11 @@ "ingress_port": 1337, "panel_icon": "mdi:cart", "startup": "system", - "arch": [ - "aarch64", - "amd64", - "armhf", - "armv7", - "i386" - ], + "arch": ["aarch64", "amd64", "armhf", "armv7", "i386"], "boot": "auto", "hassio_api": true, "hassio_role": "default", - "map": [ - "ssl" - ], + "map": ["ssl"], "ports": { "80/tcp": null }, @@ -48,6 +40,7 @@ "stock_best_before_date_tracking": true, "stock_location_tracking": true, "stock_price_tracking": true, + "stock_product_freezing": true, "stock_product_opened_tracking": true }, "ssl": true, @@ -55,10 +48,10 @@ "keyfile": "privkey.pem" }, "schema": { - "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?", - "culture": "match(^(da|de|en|en_GB|es|fr|it|nl|no|pl|ru|sv_SE|ta|tr)$)", + "log_level": "list(trace|debug|info|notice|warning|error|fatal)?", + "culture": "list(da|de|en|en_GB|es|fr|hu|it|nl|no|pl|ru|sv_SE|tr)", "currency": "match(^[A-Z]{3}$)", - "entry_page": "match(^(stock|shoppinglist|recipes|chores|tasks|batteries|equipment|calendar|mealplan)$)", + "entry_page": "list(stock|shoppinglist|recipes|chores|tasks|batteries|equipment|calendar|mealplan)", "features": { "batteries": "bool", "calendar": "bool", @@ -75,6 +68,7 @@ "stock_best_before_date_tracking": "bool", "stock_location_tracking": "bool", "stock_price_tracking": "bool", + "stock_product_freezing": "bool", "stock_product_opened_tracking": "bool" }, "ssl": "bool", diff --git a/grocy/rootfs/etc/services.d/php-fpm/run b/grocy/rootfs/etc/services.d/php-fpm/run index d85811c..d7fad71 100644 --- a/grocy/rootfs/etc/services.d/php-fpm/run +++ b/grocy/rootfs/etc/services.d/php-fpm/run @@ -61,6 +61,10 @@ if bashio::config.false 'tweaks.stock_price_tracking'; then export GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING=0 fi +if bashio::config.false 'tweaks.stock_product_freezing'; then + export GROCY_FEATURE_FLAG_STOCK_PRODUCT_FREEZING=0 +fi + if bashio::config.false 'tweaks.stock_product_opened_tracking'; then export GROCY_FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING=0 fi