Skip to content

Commit

Permalink
⬆️ Upgrades Grocy to 2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
frenck committed Feb 4, 2020
1 parent 6d49b0a commit 6dcd134
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion grocy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
20 changes: 7 additions & 13 deletions grocy/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand All @@ -48,17 +40,18 @@
"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,
"certfile": "fullchain.pem",
"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",
Expand All @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions grocy/rootfs/etc/services.d/php-fpm/run
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6dcd134

Please sign in to comment.