Merge branch 'master' of https://github.com/danielwelch/hassio-zigbee…

…2mqtt

zigbee2mqtt/Dockerfile

@@ -4,7 +4,7 @@ FROM $BUILD_FROM
 # Add env
 ENV LANG C.UTF-8
 
-ENV ZIGBEE2MQTT_VERSION=1.3.1
+ENV ZIGBEE2MQTT_VERSION=1.4.0
 ENV ARCHIVE=zigbee2mqtt-$ZIGBEE2MQTT_VERSION
 
 COPY requirements.txt /requirements.txt
@@ -24,6 +24,7 @@ RUN apk add --update --no-cache curl jq nodejs>10.14.2 npm python3 python3-dev \
 
 COPY run.sh /$ARCHIVE/run.sh
 COPY set_config.py /$ARCHIVE/set_config.py
+COPY README.md /$ARCHIVE/README.md
 WORKDIR /$ARCHIVE
 
 RUN ["chmod", "a+x", "./run.sh"]

zigbee2mqtt/README.md

@@ -0,0 +1,18 @@
+<div align="center">
+<img src="https://github.com/Koenkk/zigbee2mqtt/blob/master/images/logo.png?raw=true"/>
+<h1>Zigbee2mqtt Hass.io Add-on</h1>
+<div style="display: flex; justify-content: center;">
+  <a style="margin-right: 0.5rem;" href="https://travis-ci.org/danielwelch/hassio-zigbee2mqtt">
+    <img src="https://img.shields.io/travis/danielwelch/hassio-zigbee2mqtt.svg?style=flat-square&logo=travis">
+  </a>
+  <a style="margin-left: 0.5rem;" href="https://cloud.docker.com/u/dwelch2101/repository/docker/dwelch2101/zigbee2mqtt-armhf">
+    <img src="https://img.shields.io/docker/pulls/dwelch2101/zigbee2mqtt-armhf.svg?style=flat-square&logo=docker">
+  </a>
+</div>
+<br>
+<p>Run Zigbee2mqtt as a Hass.io Add-on</p>
+</div>
+
+# WARNING! Breaking Changes Notice
+
+Breaking changes are planned for the add-on configuration in the upcoming v1.5.0 release. *There are no breaking changes to the configuration in v1.4.0*. The changes will require some slight re-structuring of your configuration in the Hass.io frontend, but will ultimately move the configuration structure and syntax closer to that of zigbee2mqtt itself. See https://github.com/danielwelch/hassio-zigbee2mqtt/pull/144 for more information. Of course, the documentation will be updated to reflect the changes in v.1.5.0.

zigbee2mqtt/config.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "slug": "zigbee2mqtt",
   "description": "Zigbee to MQTT Bridge",
   "auto_uart": true,