From 0dd3b81031f64ee169e3ce6f381f6b78c1c37b39 Mon Sep 17 00:00:00 2001 From: Jorim Tielemans Date: Fri, 24 May 2019 20:09:52 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20Grocy=20to=20v2?= =?UTF-8?q?.4.1=20(#20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ⬆️ Upgrades Grocy to v2.4.0 * Add new config options * Hide all stock related things * Fix env var name * ⬆️ Upgrades Grocy to v2.4.1 --- grocy/Dockerfile | 2 +- grocy/config.json | 4 +++- grocy/rootfs/etc/services.d/php-fpm/run | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/grocy/Dockerfile b/grocy/Dockerfile index 286ec32..d59cd28 100755 --- a/grocy/Dockerfile +++ b/grocy/Dockerfile @@ -27,7 +27,7 @@ RUN \ \ && yarn global add modclean \ \ - && git clone --branch "v2.3.0" --depth=1 \ + && git clone --branch "v2.4.1" --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 c66991b..1e65a5e 100755 --- a/grocy/config.json +++ b/grocy/config.json @@ -35,6 +35,7 @@ "equipment": true, "recipes": true, "shoppinglist": true, + "stock": true, "tasks": true }, "ssl": true, @@ -43,7 +44,7 @@ }, "schema": { "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?", - "culture": "match(^(da|de|en|es|fr|it|nl|no|pl|ru|ta|tr)$)", + "culture": "match(^(da|de|en|es|fr|it|nl|no|pl|ru|sv_SE|ta|tr)$)", "currency": "str", "features": { "batteries": "bool", @@ -52,6 +53,7 @@ "equipment": "bool", "recipes": "bool", "shoppinglist": "bool", + "stock": "bool", "tasks": "bool" }, "ssl": "bool", diff --git a/grocy/rootfs/etc/services.d/php-fpm/run b/grocy/rootfs/etc/services.d/php-fpm/run index e58f424..87bf7fd 100644 --- a/grocy/rootfs/etc/services.d/php-fpm/run +++ b/grocy/rootfs/etc/services.d/php-fpm/run @@ -32,6 +32,10 @@ if bashio::config.false 'features.shoppinglist'; then export GROCY_FEATURE_FLAG_SHOPPINGLIST=0 fi +if bashio::config.false 'features.stock'; then + export GROCY_FEATURE_FLAG_STOCK=0 +fi + if bashio::config.false 'features.tasks'; then export GROCY_FEATURE_FLAG_TASKS=0 fi