Bump version to v1.14.2

* Fix typo

* Fix typo

* Fix typo

* Fix typo

esphome-beta/README.md

@@ -44,8 +44,6 @@ first:
 5. Start the add-on, check the logs of the add-on to see if everything went well.
 6. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Hass.io's authentication system to log you in.
 
-**NOTE**: Installation on RPis running in 64-bit mode is currently not possible. Please use the 32-bit variant of HassOS instead.
-
 You can view the ESPHome docs here: https://esphome.io/
 
 ## Configuration
@@ -58,15 +56,10 @@ Example add-on configuration:
 {
   "ssl": false,
   "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem",
-  "port": 6052
+  "keyfile": "privkey.pem"
 }
 ```
 
-### Option: `port`
-
-The port to start the dashboard server on. Default is 6052.
-
 ### Option: `ssl`
 
 Enables/Disables encrypted SSL (HTTPS) connections to the web server of this add-on.
@@ -115,7 +108,7 @@ Setting this to `true` will make ESPHome use ICMP ping requests to get the node
 
 ### Option: `streamer_mode`
 
-If set to `true`, this will enable stremer mode, which makes ESPHome hide all
+If set to `true`, this will enable streamer mode, which makes ESPHome hide all
 potentially private information. So for example WiFi (B)SSIDs (which could be
 used to find your location), usernames etc. Please note that you need to use
 the `!secret` tag in your YAML file to also prevent these from showing up
@@ -123,7 +116,7 @@ while editing and validating.
 
 [discord-shield]: https://img.shields.io/discord/429907082951524364.svg
 [dht22]: https://esphome.io/components/sensor/dht.html
-[discord]: https://discord.me/KhAMKrd
+[discord]: https://discord.gg/KhAMKrd
 [releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
 [releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome

esphome-beta/config.json

@@ -1,46 +1,47 @@
 {
-  "url": "https://esphome.io/",
-  "webui": "http://[HOST]:[PORT:6052]",
-  "startup": "application",
-  "boot": "auto",
   "arch": [
     "amd64",
     "i386",
     "armv7",
     "aarch64"
   ],
-  "hassio_api": true,
   "auth_api": true,
+  "auto_uart": true,
+  "boot": "auto",
+  "description": "Beta version of ESPHome Hass.io add-on.",
+  "hassio_api": true,
   "hassio_role": "default",
   "homeassistant_api": false,
   "host_network": true,
+  "image": "esphome/esphome-hassio-{arch}",
   "ingress": true,
   "ingress_port": 0,
+  "map": [
+    "ssl:ro",
+    "config:rw"
+  ],
+  "name": "ESPHome (beta)",
+  "options": {},
   "panel_icon": "mdi:chip",
-  "auto_uart": true,
   "ports": {
     "6052/tcp": null
   },
   "ports_description": {
     "6052/tcp": "Web interface (Not required for Hass.io Ingress)"
   },
-  "map": [
-    "ssl",
-    "config:rw"
-  ],
   "schema": {
-    "ssl": "bool?",
     "certfile": "str?",
+    "esphome_version": "str?",
     "keyfile": "str?",
     "leave_front_door_open": "bool?",
-    "esphome_version": "str?",
-    "streamer_mode": "bool?",
     "relative_url": "str?",
-    "status_use_ping": "bool?"
+    "ssl": "bool?",
+    "status_use_ping": "bool?",
+    "streamer_mode": "bool?"
   },
-  "name": "ESPHome (beta)",
-  "version": "1.13.0b1",
-  "description": "Beta version of ESPHome Hass.io add-on.",
-  "image": "esphome/esphome-hassio-{arch}",
-  "options": {}
+  "slug": "esphome-beta",
+  "startup": "application",
+  "url": "https://beta.esphome.io/",
+  "version": "1.14.2",
+  "webui": "http://[HOST]:[PORT:6052]"
 }

esphome-dev/Dockerfile

@@ -1,10 +1,10 @@
-ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.5.1
+ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:2.0.0
 FROM ${BUILD_FROM}
 
 # Copy root filesystem
 COPY rootfs /
 
-RUN pip2 install --no-cache-dir https://github.com/esphome/esphome/archive/dev.zip
+RUN pip3 install --no-cache-dir https://github.com/esphome/esphome/archive/dev.zip
 
 # Build arguments
 ARG BUILD_VERSION=dev

esphome-dev/README.md

@@ -44,8 +44,6 @@ first:
 5. Start the add-on, check the logs of the add-on to see if everything went well.
 6. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Hass.io's authentication system to log you in.
 
-**NOTE**: Installation on RPis running in 64-bit mode is currently not possible. Please use the 32-bit variant of HassOS instead.
-
 You can view the ESPHome docs here: https://esphome.io/
 
 ## Configuration
@@ -58,15 +56,10 @@ Example add-on configuration:
 {
   "ssl": false,
   "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem",
-  "port": 6052
+  "keyfile": "privkey.pem"
 }
 ```
 
-### Option: `port`
-
-The port to start the dashboard server on. Default is 6052.
-
 ### Option: `ssl`
 
 Enables/Disables encrypted SSL (HTTPS) connections to the web server of this add-on.
@@ -115,7 +108,7 @@ Setting this to `true` will make ESPHome use ICMP ping requests to get the node
 
 ### Option: `streamer_mode`
 
-If set to `true`, this will enable stremer mode, which makes ESPHome hide all
+If set to `true`, this will enable streamer mode, which makes ESPHome hide all
 potentially private information. So for example WiFi (B)SSIDs (which could be
 used to find your location), usernames etc. Please note that you need to use
 the `!secret` tag in your YAML file to also prevent these from showing up
@@ -123,7 +116,7 @@ while editing and validating.
 
 [discord-shield]: https://img.shields.io/discord/429907082951524364.svg
 [dht22]: https://esphome.io/components/sensor/dht.html
-[discord]: https://discord.me/KhAMKrd
+[discord]: https://discord.gg/KhAMKrd
 [releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
 [releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome

esphome-dev/build.json

@@ -1,10 +1,10 @@
 {
-  "squash": false,
+  "args": {},
   "build_from": {
-    "amd64": "esphome/esphome-hassio-base-amd64:1.6.0",
-    "i386": "esphome/esphome-hassio-base-i386:1.6.0",
-    "armv7": "esphome/esphome-hassio-base-armv7:1.6.0",
-    "aarch64": "esphome/esphome-hassio-base-aarch64:1.6.0"
+    "aarch64": "esphome/esphome-hassio-base-aarch64:2.0.1",
+    "amd64": "esphome/esphome-hassio-base-amd64:2.0.1",
+    "armv7": "esphome/esphome-hassio-base-armv7:2.0.1",
+    "i386": "esphome/esphome-hassio-base-i386:2.0.1"
   },
-  "args": {}
+  "squash": false
 }

esphome-dev/config.json

@@ -1,48 +1,48 @@
 {
-  "url": "https://esphome.io/",
-  "webui": "http://[HOST]:[PORT:6052]",
-  "startup": "application",
-  "boot": "auto",
   "arch": [
     "amd64",
     "i386",
     "armv7",
     "aarch64"
   ],
-  "hassio_api": true,
   "auth_api": true,
+  "auto_uart": true,
+  "boot": "auto",
+  "description": "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files",
+  "hassio_api": true,
   "hassio_role": "default",
   "homeassistant_api": false,
   "host_network": true,
   "ingress": true,
   "ingress_port": 0,
+  "map": [
+    "ssl:ro",
+    "config:rw"
+  ],
+  "name": "ESPHome (dev)",
+  "options": {
+    "esphome_version": "dev"
+  },
   "panel_icon": "mdi:chip",
-  "auto_uart": true,
   "ports": {
     "6052/tcp": null
   },
   "ports_description": {
     "6052/tcp": "Web interface (Not required for Hass.io Ingress)"
   },
-  "map": [
-    "ssl",
-    "config:rw"
-  ],
   "schema": {
-    "ssl": "bool?",
     "certfile": "str?",
+    "esphome_version": "str?",
     "keyfile": "str?",
     "leave_front_door_open": "bool?",
-    "esphome_version": "str?",
-    "streamer_mode": "bool?",
     "relative_url": "str?",
-    "status_use_ping": "bool?"
+    "ssl": "bool?",
+    "status_use_ping": "bool?",
+    "streamer_mode": "bool?"
   },
-  "name": "ESPHome (dev)",
-  "version": "dev",
   "slug": "esphome-dev",
-  "description": "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files",
-  "options": {
-    "esphome_version": "dev"
-  }
+  "startup": "application",
+  "url": "https://next.esphome.io/",
+  "version": "dev",
+  "webui": "http://[HOST]:[PORT:6052]"
 }

esphome-dev/rootfs/etc/cont-init.d/30-esphome.sh

@@ -10,6 +10,6 @@ if bashio::config.has_value 'esphome_version'; then
     esphome_version=$(bashio::config 'esphome_version')
     full_url="https://github.com/esphome/esphome/archive/${esphome_version}.zip"
     bashio::log.info "Installing esphome version '${esphome_version}' (${full_url})..."
-    pip2 install -U --no-cache-dir "${full_url}" \
+    pip3 install -U --no-cache-dir "${full_url}" \
       || bashio::exit.nok "Failed installing esphome pinned version."
 fi

esphome-dev/rootfs/etc/nginx/servers/direct-ssl.disabled

@@ -4,6 +4,11 @@ server {
     include /etc/nginx/includes/server_params.conf;
     include /etc/nginx/includes/proxy_params.conf;
     include /etc/nginx/includes/ssl_params.conf;
+
+    ssl on;
+    ssl_certificate /ssl/%%certfile%%;
+    ssl_certificate_key /ssl/%%keyfile%%;
+
     # Clear Hass.io Ingress header
     proxy_set_header X-Hassio-Ingress "";
 

esphome/README.md

@@ -44,8 +44,6 @@ first:
 5. Start the add-on, check the logs of the add-on to see if everything went well.
 6. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Hass.io's authentication system to log you in.
 
-**NOTE**: Installation on RPis running in 64-bit mode is currently not possible. Please use the 32-bit variant of HassOS instead.
-
 You can view the ESPHome docs here: https://esphome.io/
 
 ## Configuration
@@ -58,15 +56,10 @@ Example add-on configuration:
 {
   "ssl": false,
   "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem",
-  "port": 6052
+  "keyfile": "privkey.pem"
 }
 ```
 
-### Option: `port`
-
-The port to start the dashboard server on. Default is 6052.
-
 ### Option: `ssl`
 
 Enables/Disables encrypted SSL (HTTPS) connections to the web server of this add-on.
@@ -115,7 +108,7 @@ Setting this to `true` will make ESPHome use ICMP ping requests to get the node
 
 ### Option: `streamer_mode`
 
-If set to `true`, this will enable stremer mode, which makes ESPHome hide all
+If set to `true`, this will enable streamer mode, which makes ESPHome hide all
 potentially private information. So for example WiFi (B)SSIDs (which could be
 used to find your location), usernames etc. Please note that you need to use
 the `!secret` tag in your YAML file to also prevent these from showing up
@@ -123,7 +116,7 @@ while editing and validating.
 
 [discord-shield]: https://img.shields.io/discord/429907082951524364.svg
 [dht22]: https://esphome.io/components/sensor/dht.html
-[discord]: https://discord.me/KhAMKrd
+[discord]: https://discord.gg/KhAMKrd
 [releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
 [releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome

esphome/config.json

@@ -1,43 +1,47 @@
 {
-  "name": "ESPHome",
-  "version": "1.12.2",
-  "slug": "esphome",
-  "description": "ESPHome Hass.io add-on for intelligently managing all your ESP8266/ESP32 devices.",
-  "url": "https://esphome.io/",
-  "webui": "http://[HOST]:[PORT:6052]",
-  "startup": "application",
   "arch": [
     "amd64",
-    "armhf",
-    "i386"
+    "i386",
+    "armv7",
+    "aarch64"
   ],
-  "hassio_api": true,
   "auth_api": true,
+  "auto_uart": true,
+  "boot": "auto",
+  "description": "ESPHome Hass.io add-on for intelligently managing all your ESP8266/ESP32 devices.",
+  "hassio_api": true,
   "hassio_role": "default",
   "homeassistant_api": false,
   "host_network": true,
-  "boot": "auto",
-  "auto_uart": true,
+  "image": "esphome/esphome-hassio-{arch}",
+  "ingress": true,
+  "ingress_port": 0,
   "map": [
-    "ssl",
+    "ssl:ro",
     "config:rw"
   ],
-  "options": {
-    "ssl": false,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem",
-    "port": 6052
+  "name": "ESPHome",
+  "options": {},
+  "panel_icon": "mdi:chip",
+  "ports": {
+    "6052/tcp": null
+  },
+  "ports_description": {
+    "6052/tcp": "Web interface (Not required for Hass.io Ingress)"
   },
   "schema": {
-    "ssl": "bool",
-    "certfile": "str",
-    "keyfile": "str",
-    "port": "int",
-    "leave_front_door_open": "bool?",
+    "certfile": "str?",
     "esphome_version": "str?",
-    "streamer_mode": "bool?",
+    "keyfile": "str?",
+    "leave_front_door_open": "bool?",
     "relative_url": "str?",
-    "status_use_ping": "bool?"
+    "ssl": "bool?",
+    "status_use_ping": "bool?",
+    "streamer_mode": "bool?"
   },
-  "image": "esphome/esphome-hassio-{arch}"
-}
+  "slug": "esphome",
+  "startup": "application",
+  "url": "https://esphome.io/",
+  "version": "1.14.2",
+  "webui": "http://[HOST]:[PORT:6052]"
+}

script/generate.py

@@ -30,7 +30,7 @@ for channel in args.channels:
     dir_ = root / conf.pop('directory')
     path = dir_ / 'config.json'
     with open(path, 'w') as f:
-        json.dump(conf, f, indent=2)
+        json.dump(conf, f, indent=2, sort_keys=True)
 
     for file_, conf_ in copyf.items():
         copyfile(templ / file_, dir_ / file_)
@@ -43,6 +43,6 @@ for channel in args.channels:
             "args": {}
         }
         with open(path, 'w') as f:
-            json.dump(build_conf, f, indent=2)
+            json.dump(build_conf, f, indent=2, sort_keys=True)
 
     print(f"Wrote {path}")

template/README.md

@@ -44,8 +44,6 @@ first:
 5. Start the add-on, check the logs of the add-on to see if everything went well.
 6. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Hass.io's authentication system to log you in.
 
-**NOTE**: Installation on RPis running in 64-bit mode is currently not possible. Please use the 32-bit variant of HassOS instead.
-
 You can view the ESPHome docs here: https://esphome.io/
 
 ## Configuration
@@ -58,15 +56,10 @@ Example add-on configuration:
 {
   "ssl": false,
   "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem",
-  "port": 6052
+  "keyfile": "privkey.pem"
 }
 ```
 
-### Option: `port`
-
-The port to start the dashboard server on. Default is 6052.
-
 ### Option: `ssl`
 
 Enables/Disables encrypted SSL (HTTPS) connections to the web server of this add-on.
@@ -115,7 +108,7 @@ Setting this to `true` will make ESPHome use ICMP ping requests to get the node
 
 ### Option: `streamer_mode`
 
-If set to `true`, this will enable stremer mode, which makes ESPHome hide all
+If set to `true`, this will enable streamer mode, which makes ESPHome hide all
 potentially private information. So for example WiFi (B)SSIDs (which could be
 used to find your location), usernames etc. Please note that you need to use
 the `!secret` tag in your YAML file to also prevent these from showing up
@@ -123,7 +116,7 @@ while editing and validating.
 
 [discord-shield]: https://img.shields.io/discord/429907082951524364.svg
 [dht22]: https://esphome.io/components/sensor/dht.html
-[discord]: https://discord.me/KhAMKrd
+[discord]: https://discord.gg/KhAMKrd
 [releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
 [releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome

template/config.yaml

@@ -28,7 +28,7 @@ base: &base
   ports_description:
     '6052/tcp': "Web interface (Not required for Hass.io Ingress)"
   map:
-    - ssl
+    - ssl:ro
     - config:rw
   schema:
     ssl: bool?
@@ -39,15 +39,16 @@ base: &base
     streamer_mode: bool?
     relative_url: str?
     status_use_ping: bool?
-  base_image: esphome/esphome-hassio-base-{arch}:1.6.0
+  base_image: esphome/esphome-hassio-base-{arch}:2.0.1
 
 esphome-dev:
   <<: *base
   directory: esphome-dev
   name: ESPHome (dev)
-  version: dev
+  version: 'dev'  # DEV
   slug: esphome-dev
   description: "Development Version! Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files"
+  url: https://next.esphome.io/
   options:
     esphome_version: dev
 
@@ -55,8 +56,10 @@ esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: 1.13.0b1  # BETA
+  version: '1.14.2'  # BETA
+  slug: esphome-beta
   description: "Beta version of ESPHome Hass.io add-on."
+  url: https://beta.esphome.io/
   image: esphome/esphome-hassio-{arch}
   options: {}
 
@@ -64,7 +67,8 @@ esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: 1.12.2  # STABLE
+  version: '1.14.2'  # STABLE
+  slug: esphome
   description: "ESPHome Hass.io add-on for intelligently managing all your ESP8266/ESP32 devices."
   image: esphome/esphome-hassio-{arch}
   options: {}