diff --git a/ada/config.json b/ada/config.json index c3419df1ccc..5c3bb9b3e57 100644 --- a/ada/config.json +++ b/ada/config.json @@ -6,8 +6,6 @@ "url": "https://github.com/home-assistant/hassio-addons/blob/master/ada", "arch": ["armhf", "armv7", "amd64"], "init": false, - "startup": "application", - "boot": "auto", "audio": true, "homeassistant": "0.102.0", "homeassistant_api": true, diff --git a/almond/config.json b/almond/config.json index 7bf7609fb8d..4e64a970ec9 100644 --- a/almond/config.json +++ b/almond/config.json @@ -5,9 +5,7 @@ "description": "The home server version of Almond", "url": "https://github.com/home-assistant/hassio-addons/blob/master/almond", "arch": ["armv7", "aarch64", "amd64"], - "startup": "application", "init": false, - "boot": "auto", "discovery": ["almond"], "ingress": true, "panel_icon": "mdi:comment-eye-outline", diff --git a/configurator/config.json b/configurator/config.json index d71a294100a..10ee7119778 100644 --- a/configurator/config.json +++ b/configurator/config.json @@ -6,12 +6,10 @@ "url": "https://github.com/home-assistant/hassio-addons/tree/master/configurator", "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "homeassistant": "0.91.1", - "startup": "application", "init": false, "ingress": true, "panel_icon": "mdi:wrench", "homeassistant_api": true, - "boot": "auto", "map": ["backup:rw", "config:rw", "media:rw", "share:rw", "ssl:rw"], "options": { "dirsfirst": false, diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md index 423e649a4ff..a216566052d 100644 --- a/deconz/CHANGELOG.md +++ b/deconz/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 6.6.5 + +- Update hardware configuration for Supervisor 2021.02.5 + ## 6.6.4 - Fix errors with new Supervisor as transit update diff --git a/deconz/config.json b/deconz/config.json index 2379d30470d..2a5657e4642 100644 --- a/deconz/config.json +++ b/deconz/config.json @@ -1,12 +1,11 @@ { "name": "deCONZ", - "version": "6.6.4", + "version": "6.6.5", "slug": "deconz", "description": "Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik", "arch": ["amd64", "armhf", "aarch64"], "url": "https://github.com/home-assistant/hassio-addons/tree/master/deconz", "startup": "services", - "boot": "auto", "init": false, "ingress": true, "ingress_entry": "ingress.html", @@ -24,18 +23,18 @@ "40850/tcp": "deCONZ API backend (Not required for Ingress)" }, "kernel_modules": true, - "auto_uart": true, + "usb": true, "udev": true, "gpio": true, "apparmor": false, "privileged": ["SYS_MODULE", "SYS_RAWIO"], - "devices": ["/dev/bus/usb:/dev/bus/usb:rwm", "/dev/mem:/dev/mem:rw"], + "devices": ["/dev/mem:rw"], "snapshot_exclude": ["*/otau"], "options": { "device": null }, "schema": { - "device": "str", + "device": "device(subsystem=tty)", "dbg_aps": "int?", "dbg_info": "int?", "dbg_otau": "int?", diff --git a/deconz/rootfs/etc/services.d/deconz/run b/deconz/rootfs/etc/services.d/deconz/run index 968ed9fb033..1e8685e11e4 100644 --- a/deconz/rootfs/etc/services.d/deconz/run +++ b/deconz/rootfs/etc/services.d/deconz/run @@ -6,24 +6,6 @@ TMP_FOLDER=$(mktemp -d) # Lookup udev link DECONZ_DEVICE=$(bashio::config 'device') -if [[ -c "${DECONZ_DEVICE}" ]]; then - bashio::log.debug "Specified device points to a character special file, continuing" -else - bashio::log.info "Waiting for device..." - - # 180 second timeout to wait for udev to finish processing - timeout=180 - while [[ ! -L "${DECONZ_DEVICE}" ]]; do - if [[ "${timeout}" -eq 0 ]]; then - bashio::exit.nok "No device ${DECONZ_DEVICE} found!" - fi - bashio::log.debug "Waiting for udev to link device..," - sleep 1 - ((timeout--)) - done - DECONZ_DEVICE="$(readlink -f "${DECONZ_DEVICE}")" - bashio::log.debug "Found device! Location: ${DECONZ_DEVICE}" -fi # VNC is not enabled as a separate service, as it cannot handle multiple # session when running in the foreground. diff --git a/deconz/rootfs/etc/services.d/udev/run b/deconz/rootfs/etc/services.d/udev/run deleted file mode 100644 index 545ea66dbd8..00000000000 --- a/deconz/rootfs/etc/services.d/udev/run +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Start udevd service -# ============================================================================== - -if bashio::fs.directory_exists /run/udev; then - exec sleep infinity -fi - -# Triggers udev reload in the background -./trigger & - -bashio::log.info "Starting udevd..." -exec /lib/systemd/systemd-udevd 2>/dev/null diff --git a/deconz/rootfs/etc/services.d/udev/trigger b/deconz/rootfs/etc/services.d/udev/trigger deleted file mode 100755 index e8c13d46b38..00000000000 --- a/deconz/rootfs/etc/services.d/udev/trigger +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Trigger a uDEV reload -# ============================================================================== - -# Give udevd time to start -sleep 3 -bashio::hardware.trigger - -# Again, just to be sure -sleep 10 -bashio::hardware.trigger diff --git a/dhcp_server/config.json b/dhcp_server/config.json index 4f2890f81d5..d63f75affb4 100644 --- a/dhcp_server/config.json +++ b/dhcp_server/config.json @@ -7,7 +7,6 @@ "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "advanced": true, "startup": "system", - "boot": "auto", "host_network": true, "options": { "default_lease": 86400, diff --git a/dnsmasq/config.json b/dnsmasq/config.json index 4adfaf1f2ba..f3b2b7308fd 100644 --- a/dnsmasq/config.json +++ b/dnsmasq/config.json @@ -7,7 +7,6 @@ "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "advanced": true, "startup": "system", - "boot": "auto", "ports": { "53/tcp": 53, "53/udp": 53 diff --git a/duckdns/config.json b/duckdns/config.json index d06bdf9f8f8..4b01c9f6c9f 100644 --- a/duckdns/config.json +++ b/duckdns/config.json @@ -6,7 +6,6 @@ "url": "https://github.com/home-assistant/hassio-addons/tree/master/duckdns", "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "services", - "boot": "auto", "map": ["ssl:rw"], "options": { "lets_encrypt": { diff --git a/google_assistant/config.json b/google_assistant/config.json index 3fc5500c948..8da4390f2c9 100644 --- a/google_assistant/config.json +++ b/google_assistant/config.json @@ -4,8 +4,6 @@ "slug": "google_assistant", "description": "A virtual personal assistant developed by Google", "url": "https://github.com/home-assistant/hassio-addons/tree/master/google_assistant", - "startup": "application", - "boot": "auto", "arch": ["armhf", "armv7", "amd64"], "init": false, "advanced": true, diff --git a/homematic/CHANGELOG.md b/homematic/CHANGELOG.md index c79753ed5c7..b71688d77c6 100644 --- a/homematic/CHANGELOG.md +++ b/homematic/CHANGELOG.md @@ -1,9 +1,10 @@ # Changelog -## +## 11.1.0 - Migrate OCCU back to EQ3 - Use Home helper again +- Update hardware configuration for Supervisor 2021.02.5 ## 11.0.6 diff --git a/homematic/config.json b/homematic/config.json index ac79b16749d..d0d73bf05e8 100644 --- a/homematic/config.json +++ b/homematic/config.json @@ -1,15 +1,13 @@ { "name": "HomeMatic CCU", - "version": "11.0.6", + "version": "11.1.0", "slug": "homematic", "description": "HomeMatic central based on OCCU", "url": "https://github.com/home-assistant/hassio-addons/tree/master/homematic", "arch": ["armv7", "i386"], "map": ["share:rw"], "startup": "system", - "boot": "auto", "timeout": 15, - "auto_uart": true, "gpio": true, "apparmor": false, "ingress": true, @@ -37,7 +35,7 @@ "rf": [ { "type": "match(CCU2)", - "device": "match(^/dev/.*$)", + "device": "device(subsystem=tty)", "reset": "bool?" } ], @@ -53,7 +51,7 @@ "hmip": [ { "type": "match(HMIP_CCU2)", - "device": "match(^/dev/.*$)" + "device": "device(subsystem=tty)" } ], "regahss_reset": "bool?" diff --git a/mariadb/config.json b/mariadb/config.json index 9059fa4a5ed..145f062182f 100644 --- a/mariadb/config.json +++ b/mariadb/config.json @@ -6,7 +6,6 @@ "url": "https://github.com/home-assistant/hassio-addons/tree/master/mariadb", "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "system", - "boot": "auto", "init": false, "timeout": 20, "services": ["mysql:provide"], diff --git a/mosquitto/config.json b/mosquitto/config.json index 9f4f4199820..69cab156bd1 100644 --- a/mosquitto/config.json +++ b/mosquitto/config.json @@ -6,7 +6,6 @@ "url": "https://github.com/home-assistant/hassio-addons/tree/master/mosquitto", "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "system", - "boot": "auto", "map": ["ssl", "share"], "discovery": ["mqtt"], "services": ["mqtt:provide"], diff --git a/nginx_proxy/config.json b/nginx_proxy/config.json index a6cd91cdc65..35ca85ecd8c 100644 --- a/nginx_proxy/config.json +++ b/nginx_proxy/config.json @@ -5,8 +5,6 @@ "description": "An SSL/TLS proxy", "url": "https://github.com/home-assistant/hassio-addons/tree/master/nginx_proxy", "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], - "startup": "application", - "boot": "auto", "ports": { "80/tcp": null, "443/tcp": 443 diff --git a/rpc_shutdown/config.json b/rpc_shutdown/config.json index 95dc7667251..623f72c2187 100644 --- a/rpc_shutdown/config.json +++ b/rpc_shutdown/config.json @@ -6,7 +6,6 @@ "url": "https://github.com/home-assistant/hassio-addons/tree/master/rpc_shutdown", "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "services", - "boot": "auto", "stdin": true, "host_network": true, "options": { diff --git a/samba/config.json b/samba/config.json index a1cb38f3d8b..6b6070d3807 100644 --- a/samba/config.json +++ b/samba/config.json @@ -6,7 +6,6 @@ "url": "https://github.com/home-assistant/hassio-addons/tree/master/samba", "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "services", - "boot": "auto", "init": false, "host_network": true, "map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw", "media:rw"], diff --git a/ssh/config.json b/ssh/config.json index 3a2eea2f6fd..409c9c4cb4a 100644 --- a/ssh/config.json +++ b/ssh/config.json @@ -12,11 +12,10 @@ "ingress": true, "panel_icon": "mdi:console", "panel_title": "Terminal", - "boot": "auto", "hassio_api": true, "hassio_role": "manager", "audio": true, - "auto_uart": true, + "uart": true, "ports": { "22/tcp": null }, diff --git a/tellstick/CHANGELOG.md b/tellstick/CHANGELOG.md index 527317d9610..ca5808914e6 100644 --- a/tellstick/CHANGELOG.md +++ b/tellstick/CHANGELOG.md @@ -1,16 +1,21 @@ # Changelog -## 2.0 +## 2.1.0 + +- Update hardware configuration for Supervisor 2021.02.5 +- Use Alpine 3.13 + +## 2.0.0 - Rewrites add-on onto Bashio - Added documentation to the add-on repository - Code formatting -## 1.0 +## 1.0.0 - Update base image -## 0.5 +## 0.5.0 - Added possibility for config options: protocols: comen, fineoffset, mandolyn, oregon diff --git a/tellstick/Dockerfile b/tellstick/Dockerfile index 6266d78ff03..ced11dab864 100644 --- a/tellstick/Dockerfile +++ b/tellstick/Dockerfile @@ -4,7 +4,10 @@ FROM $BUILD_FROM ENV LANG C.UTF-8 # Install Telldus library for TellStick (using same approach as in hassio docker installation) -RUN apk add --no-cache \ +ARG TELLDUS_COMMIT +RUN \ + set -x \ + && apk add --no-cache \ confuse \ libftdi1 \ libstdc++ \ @@ -21,8 +24,9 @@ RUN apk add --no-cache \ && ln -s /usr/include/libftdi1/ftdi.h /usr/include/ftdi.h \ && mkdir -p /usr/src \ && cd /usr/src \ - && git clone -b master --depth 1 https://github.com/telldus/telldus \ + && git clone https://github.com/telldus/telldus \ && cd telldus/telldus-core \ + && git reset --hard ${TELLDUS_COMMIT} \ && sed -i \ "/\/a \#include \" \ common/Socket_unix.cpp \ diff --git a/tellstick/build.json b/tellstick/build.json new file mode 100644 index 00000000000..5d49c247c55 --- /dev/null +++ b/tellstick/build.json @@ -0,0 +1,12 @@ +{ + "build_from": { + "aarch64": "homeassistant/aarch64-base:3.13", + "amd64": "homeassistant/amd64-base:3.13", + "armhf": "homeassistant/armhf-base:3.13", + "armv7": "homeassistant/armv7-base:3.13", + "i386": "homeassistant/i386-base:3.13" + }, + "args": { + "TELLDUS_COMMIT": "2598bbed16ffd701f2a07c99582f057a3decbaf3" + } +} diff --git a/tellstick/config.json b/tellstick/config.json index 9ab122fdaac..1cdb7362476 100644 --- a/tellstick/config.json +++ b/tellstick/config.json @@ -1,14 +1,13 @@ { "name": "TellStick", - "version": "2.0", + "version": "2.1.0", "slug": "tellstick", "description": "TellStick and TellStick Duo service", "url": "https://github.com/home-assistant/hassio-addons/tree/master/tellstick", "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"], "startup": "system", "stdin": true, - "boot": "auto", - "devices": ["/dev/bus/usb:/dev/bus/usb:rwm"], + "usb": true, "options": { "devices": [ { diff --git a/zwave/CHANGELOG.md b/zwave/CHANGELOG.md index 6ab5f62c025..0c8dfc4ad04 100644 --- a/zwave/CHANGELOG.md +++ b/zwave/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.9.1 + +- Update hardware configuration for Supervisor 2021.02.5 + ## 0.9.0 - Update OpenZWave to ee90c89 diff --git a/zwave/config.json b/zwave/config.json index 61deba0f8db..1a0b9fba604 100644 --- a/zwave/config.json +++ b/zwave/config.json @@ -1,6 +1,6 @@ { "name": "OpenZWave", - "version": "0.9.0", + "version": "0.9.1", "slug": "zwave", "description": "Control a ZWave network with Home Assistant", "arch": ["amd64", "i386", "armhf", "armv7", "aarch64"], @@ -10,7 +10,6 @@ "panel_icon": "mdi:z-wave", "panel_title": "OpenZWave", "startup": "services", - "boot": "auto", "init": false, "stage": "experimental", "homeassistant": "0.110.0.dev", @@ -24,13 +23,12 @@ }, "services": ["mqtt:want"], "discovery": ["ozw"], - "auto_uart": true, "options": { "device": null, "network_key": "" }, "schema": { - "device": "str", + "device": "device(subsystem=tty)", "network_key": "password", "instance": "int(1,)?" }, diff --git a/zwave_js/CHANGELOG.md b/zwave_js/CHANGELOG.md index 3a371dca093..b78cffdac9b 100644 --- a/zwave_js/CHANGELOG.md +++ b/zwave_js/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.1.5 + +- Update hardware configuration for Supervisor 2021.02.5 + ## 0.1.4 - Bump Z-Wave JS Server to 1.0.0-beta.4 diff --git a/zwave_js/config.json b/zwave_js/config.json index d999dbda510..e171597c252 100644 --- a/zwave_js/config.json +++ b/zwave_js/config.json @@ -16,13 +16,12 @@ "3000/tcp": "Z-Wave JS communication" }, "discovery": ["zwave_js"], - "auto_uart": true, "options": { "device": null, "network_key": "" }, "schema": { - "device": "str", + "device": "device(subsystem=tty)", "network_key": "match(|[0-9a-fA-F]{32,32})", "emulate_hardware": "bool?" },