diff --git a/README.md b/README.md index 38739a23..c18dea67 100644 --- a/README.md +++ b/README.md @@ -812,10 +812,10 @@ SOFTWARE. [grafana-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg [grafana-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg [grafana-i386-shield]: https://img.shields.io/badge/i386-no-red.svg -[addon-grocy]: https://github.com/hassio-addons/addon-grocy/tree/v0.9.2 -[addon-doc-grocy]: https://github.com/hassio-addons/addon-grocy/blob/v0.9.2/README.md +[addon-grocy]: https://github.com/hassio-addons/addon-grocy/tree/v0.10.0 +[addon-doc-grocy]: https://github.com/hassio-addons/addon-grocy/blob/v0.10.0/README.md [grocy-issue]: https://github.com/hassio-addons/addon-grocy/issues -[grocy-version-shield]: https://img.shields.io/badge/version-v0.9.2-blue.svg +[grocy-version-shield]: https://img.shields.io/badge/version-v0.10.0-blue.svg [grocy-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [grocy-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg [grocy-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg diff --git a/grocy/CHANGELOG.md b/grocy/CHANGELOG.md index 0ac2afd7..0a094ac8 100644 --- a/grocy/CHANGELOG.md +++ b/grocy/CHANGELOG.md @@ -1,14 +1,24 @@ -[Full Changelog][changelog] +## What’s changed -### πŸ”¨ Changes +Grocy 3 is here! πŸŽ‰ -- ⬆ Upgrades add-on base image to v8.0.5 -- ⬆ Upgrades php7 to 7.3.23-r0 -- ⬆ Upgrades nginx to 1.18.0-r1 -- ⬆ Upgrades composer to 1.10.16-r0 +## πŸ› Bug fixes -[changelog]: https://github.com/hassio-addons/addon-grocy/compare/v0.9.1...v0.9.2 +- Fix NGINX waiting for non-activated FPM @frenck (#116) -Questions? Join our Discord server! https://discord.me/hassioaddons -Enjoying my add-ons? Consider supporting my work: -https://github.com/sponsors/frenck or https://patreon.com/frenck \ No newline at end of file +## πŸš€ Enhancements + +- Refactor NGINX/PHP-FPM configuration @frenck (#115) + +## 🧰 Maintenance + +- Cleanup repository @frenck (#106) +- Happy New Year @frenck (#107) +- Upgrade Code of Conduct @frenck (#108) +- Add new repository workflow @frenck (#109) + +## ⬆️ Dependency updates + +- Upgrades add-on base image to v9.0.1 @fsironman (#111) +- Upgrades Grocy to v3.0.1 @fsironman (#113) +- Upgrade add-on base image to 9.1.0 @frenck (#114) diff --git a/grocy/DOCS.md b/grocy/DOCS.md index e8d3d7e5..c6576f22 100644 --- a/grocy/DOCS.md +++ b/grocy/DOCS.md @@ -70,7 +70,7 @@ dealing with an unknown issue. Possible values are: - `debug`: Shows detailed debug information. - `info`: Normal (usually) interesting events. - `warning`: Exceptional occurrences that are not errors. -- `error`: Runtime errors that do not require immediate action. +- `error`: Runtime errors that do not require immediate action. - `fatal`: Something went terribly wrong. Add-on becomes unusable. Please note that each level automatically includes log messages from a @@ -123,7 +123,7 @@ Is used for setting the language. Choose between: Determines the currency as displayed in the Grocy interface, specified by the ISO4217 three digit currency code. -Examples: `USD`, `CAD`, `GBP` or `EUR`. +Examples: `USD`, `CAD`, `GBP` or `EUR`. ### Option: `entry_page` @@ -190,16 +190,15 @@ equal Sunday: ## Changelog & Releases This repository keeps a change log using [GitHub's releases][releases] -functionality. The format of the log is based on -[Keep a Changelog][keepchangelog]. +functionality. Releases are based on [Semantic Versioning][semver], and use the format -of ``MAJOR.MINOR.PATCH``. In a nutshell, the version will be incremented +of `MAJOR.MINOR.PATCH`. In a nutshell, the version will be incremented based on the following: -- ``MAJOR``: Incompatible or major changes. -- ``MINOR``: Backwards-compatible new features and enhancements. -- ``PATCH``: Backwards-compatible bugfixes and package updates. +- `MAJOR`: Incompatible or major changes. +- `MINOR`: Backwards-compatible new features and enhancements. +- `PATCH`: Backwards-compatible bugfixes and package updates. ## Support @@ -227,7 +226,7 @@ check [the contributor's page][contributors]. MIT License -Copyright (c) 2019-2020 Franck Nijhof +Copyright (c) 2019-2021 Franck Nijhof Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -256,7 +255,6 @@ SOFTWARE. [grocy-demo]: https://demo-en.grocy.info [grocy]: https://grocy.info/ [issue]: https://github.com/hassio-addons/addon-grocy/issues -[keepchangelog]: http://keepachangelog.com/en/1.0.0/ [python-packages]: https://pypi.org/ [reddit]: https://reddit.com/r/homeassistant [releases]: https://github.com/hassio-addons/addon-grocy/releases diff --git a/grocy/README.md b/grocy/README.md index c5de4d59..11ca3f37 100644 --- a/grocy/README.md +++ b/grocy/README.md @@ -34,10 +34,10 @@ management solution for your home, delivering features like: [github-sponsors]: https://github.com/sponsors/frenck [grocy-demo]: https://demo-en.grocy.info [grocy]: https://grocy.info/ -[maintenance-shield]: https://img.shields.io/maintenance/yes/2020.svg +[maintenance-shield]: https://img.shields.io/maintenance/yes/2021.svg [patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png [patreon]: https://www.patreon.com/frenck [project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg -[release-shield]: https://img.shields.io/badge/version-v0.9.2-blue.svg -[release]: https://github.com/hassio-addons/addon-grocy/tree/v0.9.2 -[screenshot]: https://github.com/hassio-addons/addon-grocy/raw/master/images/screenshot.gif \ No newline at end of file +[release-shield]: https://img.shields.io/badge/version-v0.10.0-blue.svg +[release]: https://github.com/hassio-addons/addon-grocy/tree/v0.10.0 +[screenshot]: https://github.com/hassio-addons/addon-grocy/raw/main/images/screenshot.gif \ No newline at end of file diff --git a/grocy/config.json b/grocy/config.json index 38da9bdf..ff82edbe 100644 --- a/grocy/config.json +++ b/grocy/config.json @@ -1,14 +1,12 @@ { "name": "Grocy", - "version": "0.9.2", + "version": "0.10.0", "slug": "grocy", "description": "ERP beyond your fridge! A groceries & household management solution for your home", "url": "https://github.com/hassio-addons/addon-grocy", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]", "ingress": true, - "ingress_port": 1337, "panel_icon": "mdi:cart", - "startup": "system", "arch": [ "aarch64", "amd64", @@ -16,9 +14,6 @@ "armv7", "i386" ], - "boot": "auto", - "hassio_api": true, - "hassio_role": "default", "map": [ "ssl" ], @@ -85,5 +80,5 @@ "certfile": "str", "keyfile": "str" }, - "image": "hassioaddons/grocy-{arch}" + "image": "ghcr.io/hassio-addons/grocy/{arch}" } \ No newline at end of file