fix(deconz): Dynamicly set env vars for ports based on service (#1948)

charts/stable/deconz/Chart.yaml

@@ -22,7 +22,7 @@ name: deconz
 sources:
 - https://github.com/dresden-elektronik/deconz-rest-plugin
 - https://github.com/marthoc/docker-deconz
-version: 6.0.22
+version: 6.0.23
 annotations:
   truecharts.org/catagories: |
     - media

charts/stable/deconz/questions.yaml

@@ -109,24 +109,6 @@ questions:
           schema:
             type: int
             default: 1
-        - variable: DECONZ_WEB_PORT
-          label: "DECONZ_WEB_PORT"
-          description: "Web UI listen port"
-          schema:
-            type: int
-            default: 80
-        - variable: DECONZ_WS_PORT
-          label: "DECONZ_WS_PORT"
-          description: "Websocket listen port"
-          schema:
-            type: int
-            default: 443
-        - variable: DECONZ_VNC_PORT
-          label: "DECONZ_VNC_PORT"
-          description: " VNC server listen port"
-          schema:
-            type: int
-            default: 5900
 
 # Include{containerConfig}
 
@@ -191,7 +173,7 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 80
+                                    default: 10008
 
 
         - variable: websocket
@@ -248,7 +230,7 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 443
+                                    default: 10001
 
 
         - variable: vnc
@@ -305,7 +287,7 @@ questions:
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
-                                    default: 5900
+                                    default: 10002
 
   - variable: serviceexpert
     group: "Networking and Services"

charts/stable/deconz/values.yaml

@@ -26,12 +26,9 @@ env:
   DECONZ_DEVICE:  # /dev/ttyUSB0
   # -- Enable VNC access to the container to view the deCONZ ZigBee mesh
   DECONZ_VNC_MODE: 1
-  # -- Web UI listen port
-  DECONZ_WEB_PORT: 8080
-  # -- Websocket listen port
-  DECONZ_WS_PORT: 6080
-  # -- VNC server listen port
-  DECONZ_VNC_PORT: 5900
+  DECONZ_WEB_PORT: "{{ .Values.service.main.ports.main.port }}"
+  DECONZ_WS_PORT: "{{ .Values.service.websocket.ports.websocket.port }}"
+  DECONZ_VNC_PORT: "{{ .Values.service.vnc.ports.vnc.port }}"
   DECONZ_UID: 568
   DECONZ_GID: 568
 
@@ -42,21 +39,18 @@ service:
     ports:
       main:
         port: 10008
-        targetPort: 8080
   websocket:
     enabled: true
     ports:
       websocket:
         enabled: true
         port: 10001
-        targetPort: 6080
   vnc:
     enabled: true
     ports:
       vnc:
         enabled: true
         port: 10002
-        targetPort: 5900
 
 # -- Configure persistence settings for the chart under this key.
 # @default -- See values.yaml