From 2b6ff89517d48916e9d70a9eb2dacdadc3b68d09 Mon Sep 17 00:00:00 2001 From: Max Winterstein Date: Sat, 18 Sep 2021 22:12:17 +0200 Subject: [PATCH] Add and apply prettier pre-commit hook --- .../eufy_create_mr_and_build_image.yaml | 4 +- .../workflows/eufy_manually_build_image.yml | 16 ++-- .../workflows/toogoodtogo-ha-mqtt-bridge.yml | 2 +- .pre-commit-config.yaml | 6 ++ .prettierignore | 2 + README.md | 15 ++-- eufy-ha-mqtt-bridge/CHANGELOG.md | 35 +++++++- eufy-ha-mqtt-bridge/DOCS.md | 12 ++- eufy-ha-mqtt-bridge/README.md | 12 +-- eufy-ha-mqtt-bridge/config.json | 14 +-- ioBroker/CHANGELOG.md | 14 ++- ioBroker/DOCS.md | 21 +++-- ioBroker/README.md | 14 +-- ioBroker/build.json | 12 +-- ioBroker/config.json | 90 +++++++++---------- octoprint-proxy/CHANGELOG.md | 3 +- octoprint-proxy/README.md | 6 +- octoprint-proxy/config.json | 18 ++-- toogoodtogo-ha-mqtt-bridge/CHANGELOG.md | 10 ++- toogoodtogo-ha-mqtt-bridge/DOCS.md | 3 +- toogoodtogo-ha-mqtt-bridge/README.md | 9 +- toogoodtogo-ha-mqtt-bridge/build.json | 16 ++-- toogoodtogo-ha-mqtt-bridge/config.json | 10 +-- 23 files changed, 197 insertions(+), 147 deletions(-) create mode 100644 .pre-commit-config.yaml create mode 100644 .prettierignore diff --git a/.github/workflows/eufy_create_mr_and_build_image.yaml b/.github/workflows/eufy_create_mr_and_build_image.yaml index 40698c4..8a4ac02 100644 --- a/.github/workflows/eufy_create_mr_and_build_image.yaml +++ b/.github/workflows/eufy_create_mr_and_build_image.yaml @@ -28,7 +28,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} if: ${{ env.CONTINUE }} - + - name: Test build uses: home-assistant/builder@master with: @@ -38,7 +38,7 @@ jobs: --target eufy-ha-mqtt-bridge \ --docker-hub maxwinterstein if: ${{ env.CONTINUE }} - + - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: diff --git a/.github/workflows/eufy_manually_build_image.yml b/.github/workflows/eufy_manually_build_image.yml index b2cfade..1ba8c59 100644 --- a/.github/workflows/eufy_manually_build_image.yml +++ b/.github/workflows/eufy_manually_build_image.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: inputs: version: - description: 'Image Tag' + description: "Image Tag" required: true jobs: @@ -13,18 +13,14 @@ jobs: runs-on: ubuntu-latest steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v2 - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/toogoodtogo-ha-mqtt-bridge.yml b/.github/workflows/toogoodtogo-ha-mqtt-bridge.yml index 4c0ec80..e72053a 100644 --- a/.github/workflows/toogoodtogo-ha-mqtt-bridge.yml +++ b/.github/workflows/toogoodtogo-ha-mqtt-bridge.yml @@ -30,4 +30,4 @@ jobs: args: | --all \ --target toogoodtogo-ha-mqtt-bridge \ - --docker-hub maxwinterstein --version ${{ github.event.inputs.version }} \ No newline at end of file + --docker-hub maxwinterstein --version ${{ github.event.inputs.version }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..5209b31 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,6 @@ +repos: + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v2.3.2 + hooks: + - id: prettier + args: ["--ignore-path=.prettierignore"] diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..a8a372b --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +.devcontainer/** +.vscode/** \ No newline at end of file diff --git a/README.md b/README.md index 38f1323..8150bf6 100644 --- a/README.md +++ b/README.md @@ -2,21 +2,26 @@ Buy Me A Coffee -*Everything here is ment to be **experimental**. Happy to see feedback!* +_Everything here is ment to be **experimental**. Happy to see feedback!_ Home Assistant Addon repository containing ## Eufy Home Assistant MQTT Bridge ([matijse/eufy-ha-mqtt-bridge](https://github.com/matijse/eufy-ha-mqtt-bridge)) -Forwards Eufy Security push notifications to Home Assistant via MQTT. + +Forwards Eufy Security push notifications to Home Assistant via MQTT. ## TooGoodToGo Home Assistant MQTT Bridge ([maxwinterstein/toogoodtogo-ha-mqtt-bridge](https://github.com/maxwinterstein/toogoodtogo-ha-mqtt-bridge)) -Integrate your TooGoodToGo favourites to Home Assistant via MQTT. + +Integrate your TooGoodToGo favourites to Home Assistant via MQTT. ## ioBroker ([iobroker.net](http://iobroker.net)) -Run ioBroker as Add-on. + +Run ioBroker as Add-on. ## OctoPrint Reverse Proxy ([octoprint.org](http://octoprint.org)) + Small proxy to add OctoPrint to the Home Assistant. ## Installation -Go to the *Supervisor* Panel, select *Add-on Store*, click the three little dots on the upper right and select *Repositories*. Now fill the *Add repository* testbox with `https://github.com/MaxWinterstein/homeassistant-addons/` and click *Add*. + +Go to the _Supervisor_ Panel, select _Add-on Store_, click the three little dots on the upper right and select _Repositories_. Now fill the _Add repository_ testbox with `https://github.com/MaxWinterstein/homeassistant-addons/` and click _Add_. diff --git a/eufy-ha-mqtt-bridge/CHANGELOG.md b/eufy-ha-mqtt-bridge/CHANGELOG.md index 872c28c..6f059ba 100644 --- a/eufy-ha-mqtt-bridge/CHANGELOG.md +++ b/eufy-ha-mqtt-bridge/CHANGELOG.md @@ -1,96 +1,123 @@ # Changelog ## [1.23.0] - 2021-09-18 + - Update `eufy-ha-mqtt-bridge` to `0.2.23` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.22.0] - 2021-09-13 + - Update `eufy-ha-mqtt-bridge` to `0.2.22` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.21.0] - 2021-07-31 + - Update `eufy-ha-mqtt-bridge` to `0.2.21` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.20.0] - 2021-07-07 + - Update `eufy-ha-mqtt-bridge` to `0.2.20` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.19.0] - 2021-07-06 + - Update `eufy-ha-mqtt-bridge` to `0.2.19` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) - Update baseimage to `7.0.2` ## [1.18.0] - 2021-04-23 + - Update `eufy-ha-mqtt-bridge` to `0.2.18` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.17.0] - 2021-04-21 + - Update `eufy-ha-mqtt-bridge` to `0.2.16` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.16.1] - 2021-04-21 + - Fixed bug in configuration. (see [issue](https://github.com/matijse/eufy-ha-mqtt-bridge/issues/62)) ## [1.16.0] - 2021-04-20 + - Update `eufy-ha-mqtt-bridge` to `0.2.15` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.15.0] - 2021-04-14 + - Update `eufy-ha-mqtt-bridge` to `0.2.14` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.14.0] - 2021-04-08 + - Update `eufy-ha-mqtt-bridge` to `0.2.13` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.13.0] - 2021-03-06 + - Update `eufy-ha-mqtt-bridge` to `0.2.12` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.12.0] - 2021-03-06 + - Introduce new `eval` options - Do no longer store `/data` inside `share` folder ## [1.11.0] - 2021-02-15 + - Update `eufy-ha-mqtt-bridge` to `0.2.11` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.10.0] - 2021-02-14 + - Use Pre-build containers (no more unused docker images, yay). **🚨 !!Important Update Notice!! 🚨** The Update progress might fail when the installed version is <1.10.0. - Copy your *Configuration* to your clipboard and Uninstall/Install manually. - + Copy your _Configuration_ to your clipboard and Uninstall/Install manually. ## [1.9.0] - 2021-02-05 + - Update `eufy-ha-mqtt-bridge` to `0.2.10` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) - Add new configration option `mqtt.keepalive` ## [1.8.0] - 2021-01-28 + - Update `eufy-ha-mqtt-bridge` to `0.2.9` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.7.0] - 2021-01-27 + - Update `eufy-ha-mqtt-bridge` to `0.2.8` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.6.0] - 2021-01-25 + - Update `eufy-ha-mqtt-bridge` to `0.2.7` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.5.0] - 2021-01-25 + - Update `eufy-ha-mqtt-bridge` to `0.2.6` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.4.0] - 2021-01-23 + - Update `eufy-ha-mqtt-bridge` to `0.2.5` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.3.0] - 2021-01-22 + - Update `eufy-ha-mqtt-bridge` to `0.2.4` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.2.0] - 2021-01-21 + - Update `eufy-ha-mqtt-bridge` to `0.2.3` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.1.0] - 2021-01-11 + - Update `eufy-ha-mqtt-bridge` to `0.2.1` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [1.0.0] - 2021-01-10 + - Switch from `main` branch to releases from `eufy-ha-mqtt-bridge` - Update `eufy-ha-mqtt-bridge` to `0.2.0` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) ## [0.7.0] - 2021-01-05 + - Moved to dockerhub located images - Updated logo ## [0.6.0] - 2021-01-02 + - Add `hassio_role` and `hassio_api` to config to prevent error message ## [0.5.0] - 2021-01-02 + - Improve image recration by adding some cache buster - Change to bashio logs - Add `log_level` cofiguration option @@ -98,17 +125,21 @@ - Add some build date information ## [0.4.0] - 2021-01-02 + - Change base image to `hassioaddons/debian-base` - Add icon (thx to [davida72](https://github.com/matijse/eufy-ha-mqtt-bridge/issues/1#issuecomment-753333591])) ## [0.3.0] - 2020-12-31 + - Change name from **eufy-ha-mqtt-bridge** to **Eufy Home Assistant MQTT Bridge** ## [0.2.0] - 2020-12-31 + - Remove superflous `apt-get` part - Added some 'do not edit' note to config.yml - Added some note about the rebuild button - Dirtypatched log level for console output ## [0.1.0] - 2020-12-31 + - Initial release diff --git a/eufy-ha-mqtt-bridge/DOCS.md b/eufy-ha-mqtt-bridge/DOCS.md index a859c90..77d6a72 100644 --- a/eufy-ha-mqtt-bridge/DOCS.md +++ b/eufy-ha-mqtt-bridge/DOCS.md @@ -1,17 +1,19 @@ # Home Assistant Add-on: Eufy Home Assistant MQTT Bridge ## Configuration + ### `eval` (string) + Allows to pass some bash commands to run every time before the start of the bridge. Multi-line commands are possible but must end with `;`. See examples below. You might want to disable this after a run. -*Only use when you know what you are doing!* - +_Only use when you know what you are doing!_ #### Example: Symlink data dir to `shares` + ```yaml eval: | bashio::log.info "Symlinking data dir"; @@ -21,13 +23,15 @@ eval: | ``` #### Example: Copy logs to `shares` + ```yaml eval: cp -v /data/*.log /share; ``` Logs can now easily be accessed via e.g. _Visual Studio Code Add-on_. -#### Example: Export payloads to file +#### Example: Export payloads to file + To help adding more devices it is crucial to provide some information, see https://github.com/matijse/eufy-ha-mqtt-bridge/issues/7. ```yaml @@ -36,4 +40,4 @@ eval: > /share/export.csv ``` -*Note:* Asterisk must be removed from the double quotes. \ No newline at end of file +_Note:_ Asterisk must be removed from the double quotes. diff --git a/eufy-ha-mqtt-bridge/README.md b/eufy-ha-mqtt-bridge/README.md index bcb87f0..f9e7569 100644 --- a/eufy-ha-mqtt-bridge/README.md +++ b/eufy-ha-mqtt-bridge/README.md @@ -1,7 +1,9 @@ ### 🚨 Important Information 🚨 -* This addon recently switched to pre-build images. The Update progress might fail when the installed version is <1.10.0. - Copy your *Configuration* to your clipboard and Uninstall/Install manually. -* This is some experimental release! + +- This addon recently switched to pre-build images. The Update progress might fail when the installed version is <1.10.0. + Copy your _Configuration_ to your clipboard and Uninstall/Install manually. +- This is some experimental release! + --- # Home Assistant Add-on: Eufy Home Assistant MQTT Bridge @@ -16,10 +18,8 @@ **Based on https://github.com/matijse/eufy-ha-mqtt-bridge.** - - - ## ♥ + - [@matijse](https://github.com/matijse/) for coding this awesome bridge - [@davida72](https://github.com/matijse/eufy-ha-mqtt-bridge/issues/1#issuecomment-753333591]) for the awesome icon diff --git a/eufy-ha-mqtt-bridge/config.json b/eufy-ha-mqtt-bridge/config.json index 750fb70..0e340b7 100644 --- a/eufy-ha-mqtt-bridge/config.json +++ b/eufy-ha-mqtt-bridge/config.json @@ -4,13 +4,7 @@ "slug": "eufy-ha-mqtt-bridge", "image": "maxwinterstein/homeassistant-addon-eufy-ha-mqtt-bridge-{arch}", "description": "Publish events as MQTT messages", - "arch": [ - "armhf", - "armv7", - "aarch64", - "amd64", - "i386" - ], + "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "application", "boot": "auto", "options": { @@ -23,7 +17,7 @@ "username": "homeassistant", "password": "homeassistant", "keepalive": 60 - }, + }, "home_assistant": { "off_delay": 5 }, @@ -49,9 +43,7 @@ }, "stage": "experimental", "url": "https://github.com/matijse/eufy-ha-mqtt-bridge/", - "map": [ - "share:rw" - ], + "map": ["share:rw"], "hassio_role": "default", "hassio_api": true } diff --git a/ioBroker/CHANGELOG.md b/ioBroker/CHANGELOG.md index 73783c4..80b949d 100644 --- a/ioBroker/CHANGELOG.md +++ b/ioBroker/CHANGELOG.md @@ -1,28 +1,36 @@ # Changelog ## [0.8.0] - 2021-02-26 -- Introduce `eval` configuration option (see *Documentation* for more) + +- Introduce `eval` configuration option (see _Documentation_ for more) ## [0.7.0] - 2021-02-13 -- Added some more ports to be possibly exposed + +- Added some more ports to be possibly exposed ## [0.6.0] - 2021-02-12 + - Use Pre-build containers (no more unused docker images, yay). **🚨 !!Important Update Notice!! 🚨** The Update progress might fail when the installed version is <1.4.0. - Copy your *Configuration* to your clipboard and Uninstall/Install manually. + Copy your _Configuration_ to your clipboard and Uninstall/Install manually. ## [0.5.0] - 2021-01-04 + - Fix two superflous warnings ## [0.4.0] - 2020-12-30 + - Change from sha image tag to v5.1.0 ## [0.3.0] - 2020-12-30 + - Added some ports for free use (e.g. `simple api`) ## [0.2.0] - 2020-12-30 + - Fix permission bug in dockerfile ## [0.1.0] - 2020-12-30 + - Initial release diff --git a/ioBroker/DOCS.md b/ioBroker/DOCS.md index 5e91e09..6ef0111 100644 --- a/ioBroker/DOCS.md +++ b/ioBroker/DOCS.md @@ -1,6 +1,7 @@ # Home Assistant Add-on: ioBroker ## Installation + After installation, and successful startup, the ioBroker instance should be available at port `8081`. If your HA instance is running with SSL support, the `OPEN WEB UI` button might not work correctly. @@ -8,12 +9,14 @@ If your HA instance is running with SSL support, the `OPEN WEB UI` button might It might be up and running while the `Info` tab is not aware of this right now. Page reload might help. ## Updating `js-controller` -The bundled `js-controller` is not (always) the most recent version. (Thanks to *tintim* [#21](1)). -Updating can be archived manually via `portainer` or by using the [`eval` setting](#eval-(string)). +The bundled `js-controller` is not (always) the most recent version. (Thanks to _tintim_ [#21](1)). + +Updating can be archived manually via `portainer` or by using the [`eval` setting](<#eval-(string)>). Manually: Jump into the container via `portainer` and run line by line: + ```bash maintenance on iobroker update @@ -21,31 +24,35 @@ iobroker upgrade self curl -sL https://iobroker.net/fix.sh | bash ``` - ## Configuration + ### `eval` (string) + Allows to pass some bash commands to run every time before the start of ioBroker. This can be used e.g. to upgrade the `js-controller`. Example: + ```yaml eval: "iobroker update && iobroker upgrade self" ``` You might want to disable this after a run. -*Only use when you know what you are doing!* +_Only use when you know what you are doing!_ ## TODO -* Get the panel integration working (if this is possible) -* Use some official base image (maybe running the buanet dockerfile onto office image work) + +- Get the panel integration working (if this is possible) +- Use some official base image (maybe running the buanet dockerfile onto office image work) ## Technical notes + The `buanet` docker image contains some pretty useful startup script. To ensure data stays persistent across restarts I simply softlink `/data` to `/opt/iobroker`. I removed some check that was not compatible with the symlink and not needed in our case. I added the unmodified version as a reference. -[1]: https://github.com/MaxWinterstein/homeassistant-addons/issues/21 \ No newline at end of file +[1]: https://github.com/MaxWinterstein/homeassistant-addons/issues/21 diff --git a/ioBroker/README.md b/ioBroker/README.md index f6fba9d..bf102ec 100644 --- a/ioBroker/README.md +++ b/ioBroker/README.md @@ -1,8 +1,9 @@ - ### 🚨 Important Information 🚨 -* This addon recently switched to pre-build images. The Update progress might fail when the installed version is <0.6.0. - Copy your *Configuration* to your clipboard and Uninstall/Install manually. -* I do not guarantee that your ioBroker configuration will not get deleted! This is some experimental release! + +- This addon recently switched to pre-build images. The Update progress might fail when the installed version is <0.6.0. + Copy your _Configuration_ to your clipboard and Uninstall/Install manually. +- I do not guarantee that your ioBroker configuration will not get deleted! This is some experimental release! + --- # Home Assistant Add-on: ioBroker @@ -15,12 +16,11 @@ Buy Me A Coffee - -This is a pretty basic implementation of ioBroker as Home Assistant Add-on. +This is a pretty basic implementation of ioBroker as Home Assistant Add-on. It is meant to provide some playground. Mostly created as playfield for: https://blog.fuzzymistborn.com/controlling-eufy-security-devices-with-iobroker/ -and https://community.home-assistant.io/t/eufy-camera-integration/121758 +and https://community.home-assistant.io/t/eufy-camera-integration/121758 See the Documentation (DOCS.md) for more info. diff --git a/ioBroker/build.json b/ioBroker/build.json index 6e5b569..75926f5 100644 --- a/ioBroker/build.json +++ b/ioBroker/build.json @@ -1,7 +1,7 @@ { - "build_from": { - "aarch64": "buanet/iobroker:v5.1.0-aarch64", - "amd64": "buanet/iobroker:v5.1.0-amd64", - "armv7": "buanet/iobroker:v5.1.0-armv7hf" - } - } \ No newline at end of file + "build_from": { + "aarch64": "buanet/iobroker:v5.1.0-aarch64", + "amd64": "buanet/iobroker:v5.1.0-amd64", + "armv7": "buanet/iobroker:v5.1.0-armv7hf" + } +} diff --git a/ioBroker/config.json b/ioBroker/config.json index 6fc3f9e..21926bc 100644 --- a/ioBroker/config.json +++ b/ioBroker/config.json @@ -1,46 +1,46 @@ { - "name": "ioBroker", - "version": "0.8.0", - "image": "maxwinterstein/homeassistant-addon-iobroker-{arch}", - "webui": "http://[HOST]:[PORT:8081]/", - "slug": "iobroker", - "description": "Open source automation platform", - "ingress": false, - "ingress_port": 8081, - "panel_icon": "mdi:iobroker", - "arch": ["armv7", "aarch64", "amd64"], - "startup": "application", - "boot": "auto", - "options": { - "eval" : "" - }, - "schema": { - "eval" : "str?" - }, - "ports": { - "8081/tcp": 8081, - "8082/tcp": null, - "8083/tcp": null, - "8084/tcp": null, - "8085/tcp": null, - "8086/tcp": null, - "8087/tcp": null, - "8088/tcp": null, - "8089/tcp": null - }, - "ports_description": { - "8081/tcp": "Admin interface", - "8082/tcp": "reserved for addition addons", - "8083/tcp": "reserved for addition addons", - "8084/tcp": "reserved for addition addons", - "8085/tcp": "reserved for addition addons", - "8086/tcp": "reserved for addition addons", - "8087/tcp": "reserved for addition addons", - "8088/tcp": "reserved for addition addons", - "8089/tcp": "reserved for addition addons" - }, - "stage": "experimental", - "url": "https://github.com/MaxWinterstein/homeassistant-addons/", - "hassio_role": "default", - "hassio_api": true - } + "name": "ioBroker", + "version": "0.8.0", + "image": "maxwinterstein/homeassistant-addon-iobroker-{arch}", + "webui": "http://[HOST]:[PORT:8081]/", + "slug": "iobroker", + "description": "Open source automation platform", + "ingress": false, + "ingress_port": 8081, + "panel_icon": "mdi:iobroker", + "arch": ["armv7", "aarch64", "amd64"], + "startup": "application", + "boot": "auto", + "options": { + "eval": "" + }, + "schema": { + "eval": "str?" + }, + "ports": { + "8081/tcp": 8081, + "8082/tcp": null, + "8083/tcp": null, + "8084/tcp": null, + "8085/tcp": null, + "8086/tcp": null, + "8087/tcp": null, + "8088/tcp": null, + "8089/tcp": null + }, + "ports_description": { + "8081/tcp": "Admin interface", + "8082/tcp": "reserved for addition addons", + "8083/tcp": "reserved for addition addons", + "8084/tcp": "reserved for addition addons", + "8085/tcp": "reserved for addition addons", + "8086/tcp": "reserved for addition addons", + "8087/tcp": "reserved for addition addons", + "8088/tcp": "reserved for addition addons", + "8089/tcp": "reserved for addition addons" + }, + "stage": "experimental", + "url": "https://github.com/MaxWinterstein/homeassistant-addons/", + "hassio_role": "default", + "hassio_api": true +} diff --git a/octoprint-proxy/CHANGELOG.md b/octoprint-proxy/CHANGELOG.md index faea141..8b49535 100644 --- a/octoprint-proxy/CHANGELOG.md +++ b/octoprint-proxy/CHANGELOG.md @@ -1,4 +1,5 @@ # Changelog ## [1.0.0] - 2021-01-03 -- Initial release \ No newline at end of file + +- Initial release diff --git a/octoprint-proxy/README.md b/octoprint-proxy/README.md index d9747c5..77dffea 100644 --- a/octoprint-proxy/README.md +++ b/octoprint-proxy/README.md @@ -1,9 +1,9 @@ # Home Assistant Add-on: OctoPrint Proxy -Small *haproxy* based reverse proxy to have OctoPrint accessible from Home Assistant with a memory consumption less than 10Mbyte. +Small _haproxy_ based reverse proxy to have OctoPrint accessible from Home Assistant with a memory consumption less than 10Mbyte. Works okayish with OctoPi based installations, others not tested. Feedback welcome. -**Remember to enable the *Show in sidebar* option.** +**Remember to enable the _Show in sidebar_ option.** -Webcam (and some other stuff) is not working right now, will fix some day. \ No newline at end of file +Webcam (and some other stuff) is not working right now, will fix some day. diff --git a/octoprint-proxy/config.json b/octoprint-proxy/config.json index 3bf83db..11832cd 100644 --- a/octoprint-proxy/config.json +++ b/octoprint-proxy/config.json @@ -8,30 +8,24 @@ "ingress_port": 80, "panel_title": "OctoPrint", "panel_icon": "mdi:printer-3d-nozzle", - "arch": [ - "armhf", - "armv7", - "aarch64", - "amd64", - "i386" - ], + "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "application", "boot": "auto", "options": { - "octoprint_host" : "octopi", - "octoprint_port" : "443", + "octoprint_host": "octopi", + "octoprint_port": "443", "ssl": { "enabled": true, "verify": false } }, "schema": { - "octoprint_host" : "str", - "octoprint_port" : "port", + "octoprint_host": "str", + "octoprint_port": "port", "ssl": { "enabled": "bool", "verify": "bool" } }, "hassio_api": false -} \ No newline at end of file +} diff --git a/toogoodtogo-ha-mqtt-bridge/CHANGELOG.md b/toogoodtogo-ha-mqtt-bridge/CHANGELOG.md index 0f29fa8..8284e05 100644 --- a/toogoodtogo-ha-mqtt-bridge/CHANGELOG.md +++ b/toogoodtogo-ha-mqtt-bridge/CHANGELOG.md @@ -1,30 +1,38 @@ # Changelog ## [1.6.0] - 2021-03-08 + - Update `toogoodtogo-ha-mqtt-bridge` to `1.5.0` (see [release notes](https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge/releases) ## [1.5.0] - 2021-03-06 + - Update `toogoodtogo-ha-mqtt-bridge` to `1.4.0` (see [release notes](https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge/releases)) ## [1.4.0] - 2021-02-10 + - Use Pre-build containers (no more unused docker images, yay). **🚨 !!Important Update Notice!! 🚨** The Update progress might fail when the installed version is <1.4.0. - Copy your *Configuration* to your clipboard and Uninstall/Install manually. + Copy your _Configuration_ to your clipboard and Uninstall/Install manually. ## [1.3.0] - 2021-02-08 + - Update `toogoodtogo-ha-mqtt-bridge` to `1.3.0` (see [release notes](https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge/releases)) ## [1.2.0] - 2021-02-07 + - Update `toogoodtogo-ha-mqtt-bridge` to `1.2.0` (see [release notes](https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge/releases)) ## [1.1.0] - 2021-01-16 + - Update `toogoodtogo-ha-mqtt-bridge` to `1.1.0` (see [release notes](https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge/releases)) ## [1.0.0] - 2021-01-14 + - Update `toogoodtogo-ha-mqtt-bridge` to `1.0.0` (see [release notes](https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge/releases)) - Add config for the new pull interval setting `every_n_minutes`. **Add `every_n_minutes: 10` to your configuration! (See example config)** ## [0.1.0] - 2020-12-31 + - Initial release diff --git a/toogoodtogo-ha-mqtt-bridge/DOCS.md b/toogoodtogo-ha-mqtt-bridge/DOCS.md index a29ea57..23532e4 100644 --- a/toogoodtogo-ha-mqtt-bridge/DOCS.md +++ b/toogoodtogo-ha-mqtt-bridge/DOCS.md @@ -3,6 +3,7 @@ ## Configuration Example Config: + ```toml mqtt: host: homeassistant @@ -17,4 +18,4 @@ timezone: Europe/Berlin locale: en_us ``` -See https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge for more configuration options. \ No newline at end of file +See https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge for more configuration options. diff --git a/toogoodtogo-ha-mqtt-bridge/README.md b/toogoodtogo-ha-mqtt-bridge/README.md index 5752e3f..3ddda86 100644 --- a/toogoodtogo-ha-mqtt-bridge/README.md +++ b/toogoodtogo-ha-mqtt-bridge/README.md @@ -1,7 +1,9 @@ ### 🚨 Important Information 🚨 -* This addon recently switched to pre-build images. The Update progress might fail when the installed version is <1.4.0. - Copy your *Configuration* to your clipboard and Uninstall/Install manually. -* This is some experimental release! + +- This addon recently switched to pre-build images. The Update progress might fail when the installed version is <1.4.0. + Copy your _Configuration_ to your clipboard and Uninstall/Install manually. +- This is some experimental release! + --- # Home Assistant Add-on: TooGoodToGo Home Assistant MQTT Bridge @@ -16,7 +18,6 @@ Based on https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge - [aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg [amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg [armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg diff --git a/toogoodtogo-ha-mqtt-bridge/build.json b/toogoodtogo-ha-mqtt-bridge/build.json index 6010054..17a7b8a 100644 --- a/toogoodtogo-ha-mqtt-bridge/build.json +++ b/toogoodtogo-ha-mqtt-bridge/build.json @@ -1,9 +1,9 @@ { - "build_from": { - "aarch64": "ghcr.io/hassio-addons/base-python/aarch64:6.0.0", - "amd64": "ghcr.io/hassio-addons/base-python/amd64:6.0.0", - "armhf": "ghcr.io/hassio-addons/base-python/armhf:6.0.0", - "armv7": "ghcr.io/hassio-addons/base-python/armv7:6.0.0", - "i386": "ghcr.io/hassio-addons/base-python/i386:6.0.0" - } - } \ No newline at end of file + "build_from": { + "aarch64": "ghcr.io/hassio-addons/base-python/aarch64:6.0.0", + "amd64": "ghcr.io/hassio-addons/base-python/amd64:6.0.0", + "armhf": "ghcr.io/hassio-addons/base-python/armhf:6.0.0", + "armv7": "ghcr.io/hassio-addons/base-python/armv7:6.0.0", + "i386": "ghcr.io/hassio-addons/base-python/i386:6.0.0" + } +} diff --git a/toogoodtogo-ha-mqtt-bridge/config.json b/toogoodtogo-ha-mqtt-bridge/config.json index 4c441a6..ce351d0 100644 --- a/toogoodtogo-ha-mqtt-bridge/config.json +++ b/toogoodtogo-ha-mqtt-bridge/config.json @@ -4,13 +4,7 @@ "image": "maxwinterstein/homeassistant-addon-toogoodtogo-ha-mqtt-bridge-{arch}", "slug": "tgtg-ha-mqtt-bridge", "description": "Publish TooGoodToGo stock as MQTT messages", - "arch": [ - "armhf", - "armv7", - "aarch64", - "amd64", - "i386" - ], + "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "application", "boot": "auto", "options": { @@ -49,4 +43,4 @@ "url": "https://github.com/MaxWinterstein/toogoodtogo-ha-mqtt-bridge", "hassio_role": "default", "hassio_api": true -} \ No newline at end of file +}