Deconz update (#570)

* Fix deconz

* Fix url

* Allow build new version

* Revert installation way

* Cleanup

deconz/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.1
+
+- Bump deCONZ to 2.05.63
+- Remove Ingress support / Don't run well with SSL
+
 ## 2.0
 
 - Add support for Home Assistant Add-on integration

deconz/Dockerfile

@@ -1,11 +1,13 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM
 
+# Set shell
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 # Install deCONZ dependencies
 ARG BUILD_ARCH
 RUN apt-get update \
-    && apt-get install -y \
-        nginx \
+    && apt-get install -y --no-install-recommends \
         curl \
         kmod \
         lsof \
@@ -20,7 +22,6 @@ RUN apt-get update \
         libqt5websockets5 \
         libqt5widgets5 \
         sqlite3 \
-    && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     && if [ "${BUILD_ARCH}" = "armhf" ] || [ "${BUILD_ARCH}" = "aarch64" ]; \
         then \
@@ -44,6 +45,5 @@ RUN if [ "${BUILD_ARCH}" = "armhf" ] || [ "${BUILD_ARCH}" = "aarch64" ]; \
 
 COPY data/run.sh data/discovery.sh /
 COPY data/ika-otau-dl.sh /bin/
-COPY data/nginx.conf /etc/nginx/ingress.conf
 
 CMD ["/run.sh"]

deconz/README.md

@@ -2,8 +2,6 @@
 
 Add-on to allow Home Assistant to control a ZigBee network with Conbee or RaspBee hardware by Dresden Elektronik.
 
-**Note:** The Ingress support allow to load the Phoscon APP external of the Network, but they discovery only device inside same Network. That is a limitation of Phoscon APP and not Ingress itself.
-
 ## First Steps
 
 If using RaspBee, you may need to edit `config.txt` on the root of your SD card for your RaspBee to be recognized and assigned a device name. Add folling information to `config.txt`:

deconz/build.json

@@ -4,6 +4,6 @@
     "armhf": "homeassistant/armhf-base-raspbian:stretch"
   },
   "args": {
-    "DECONZ_VERSION": "2.05.59"
+    "DECONZ_VERSION": "2.05.63"
   }
 }

deconz/config.json

@@ -1,6 +1,6 @@
 {
   "name": "deCONZ",
-  "version": "2.0",
+  "version": "2.1",
   "slug": "deconz",
   "description": "Control a ZigBee network with Conbee or RaspBee by Dresden Elektronik",
   "arch": ["amd64", "armhf"],
@@ -8,10 +8,7 @@
   "startup": "system",
   "boot": "auto",
   "homeassistant": "0.91.2",
-  "webui": "http://[HOST]:[PORT:80]/pwa",
-  "ingress": true,
-  "ingress_port": 0,
-  "ingress_entry": "pwa/index.html",
+  "webui": "http://[HOST]:[PORT:80]/pwa/index.html",
   "discovery": ["deconz"],
   "ports": {
     "80/tcp": 40850,

deconz/data/nginx.conf

@@ -1,60 +0,0 @@
-worker_processes  1;
-pid /var/run/nginx.pid;
-error_log /dev/stdout info;
-daemon off;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include             mime.types;
-    default_type        application/octet-stream;
-    sendfile            on;
-    keepalive_timeout   65;
-    proxy_read_timeout  1200;
-    gzip                on;
-    gzip_disable        "msie6";
-    resolver            127.0.0.11;
-
-    upstream backend {
-        ip_hash;
-        server 127.0.0.1:%%PORT%%;
-    }
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        ''      close;
-    }
-
-    # Ingress
-    server {
-        listen %%INGRESS_INTERFACE%%:%%INGRESS_PORT%% default_server;
-
-        allow   172.30.32.2;
-        deny    all;
-
-        server_name _;
-        access_log /dev/stdout combined;
-
-        client_max_body_size 4G;
-        keepalive_timeout 5;
-
-        root /dev/null;
-
-        location / {
-            proxy_redirect off;
-            proxy_pass http://backend;
-
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection $connection_upgrade;
-
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-NginX-Proxy true;
-        }
-    }
-}

deconz/data/run.sh

@@ -43,15 +43,6 @@ bashio::log.info "Run IKEA OTA updater"
 ika-otau-dl.sh &> /dev/null &
 WAIT_PIDS+=($!)
 
-# Start Ingress handler
-bashio::log.info "Start Ingress handler"
-
-sed -i "s/%%PORT%%/${API_PORT}/g" /etc/nginx/ingress.conf
-sed -i "s/%%INGRESS_PORT%%/${INGRESS_PORT}/g" /etc/nginx/ingress.conf
-sed -i "s/%%INGRESS_INTERFACE%%/${INGRESS_INTERFACE}/g" /etc/nginx/ingress.conf
-nginx -c /etc/nginx/ingress.conf &
-WAIT_PIDS+=($!)
-
 # Register stop
 function stop_addon() {
     bashio::log.debug "Kill Processes..."