Merge branch 'SensorsIot:master' into IOBroker

Author: pegr69

.templates/adguardhome/service.yml

@@ -0,0 +1,35 @@
+adguardhome:
+  container_name: adguardhome
+  image: adguard/adguardhome
+  restart: unless-stopped
+  environment:
+    - TZ=Etc/UTC
+  # enable host mode to activate DHCP server on ports 67/udp & 68/tcp+udp
+  # note that you must also disable all other ports if you enable host mode
+  # network_mode: host
+  ports:
+    # regular DNS
+    - "53:53/tcp"
+    - "53:53/udp"
+    # administration port (http)
+    # note: external and internal ports MUST be the same
+    #       not active until defined via setup port
+    - "8089:8089/tcp"
+    # HTTPS/DNS-over-HTTPS
+    # - "443:443/tcp"
+    # DNS-over-QUIC
+    # - "784:784/udp"
+    # DNS-over-TLS
+    # - "853:853/tcp"
+    # setup (http)
+    # note: only active until port 8089 becomes active
+    - "3001:3000/tcp"
+    # DNSCrypt
+    # - "5443:5443/tcp"
+    # - "5443:5443/udp"
+  volumes:
+     - ./volumes/adguardhome/workdir:/opt/adguardhome/work
+     - ./volumes/adguardhome/confdir:/opt/adguardhome/conf
+  networks:
+    - iotstack_nw
+    - vpn_nw

.templates/blynk_server/Dockerfile

@@ -5,7 +5,7 @@ MAINTAINER 877dev <[email protected]>
 #RUN apt-get install -y apt-utils
 #RUN apt-get install -y default-jdk curl
 
-ENV BLYNK_SERVER_VERSION 0.41.14
+ENV BLYNK_SERVER_VERSION 0.41.16
 RUN mkdir /blynk
 RUN curl -L https://github.com/blynkkk/blynk-server/releases/download/v${BLYNK_SERVER_VERSION}/server-${BLYNK_SERVER_VERSION}.jar > /blynk/server.jar
 

.templates/deconz/service.yml

@@ -1,5 +1,5 @@
 deconz:
-  image: marthoc/deconz
+  image: marthoc/deconz:stable
   container_name: deconz
   restart: unless-stopped
   ports:

.templates/dozzle/service.yml

@@ -3,7 +3,7 @@ dozzle:
   image: amir20/dozzle:latest 
   restart: unless-stopped
   network_mode: host
-  ports:
-    - "8888:8080"
+  #ports:
+  # - "8888:8080"
   volumes:
     - /var/run/docker.sock:/var/run/docker.sock

.templates/home_assistant/service.yml

@@ -7,5 +7,5 @@ home_assistant:
   volumes:
     - /etc/localtime:/etc/localtime:ro
     - ./volumes/home_assistant:/config
-  network_mode: host
+  #network_mode: host
 

.templates/homebridge/service.yml

@@ -10,6 +10,6 @@ homebridge:
     - HOMEBRIDGE_CONFIG_UI_PORT=%WUIPort%
   volumes:
     - ./volumes/homebridge:/homebridge
-  ports:
-    - "4040:4040"
+  #ports:
+  #  - "4040:4040"
   network_mode: host

.templates/influxdb/service.yml

@@ -1,6 +1,6 @@
 influxdb:
   container_name: influxdb
-  image: "influxdb:latest"
+  image: "influxdb:1.8"
   restart: unless-stopped
   ports:
     - "8086:8086"

.templates/mosquitto/Dockerfile

@@ -0,0 +1,22 @@
+# Download base image
+FROM eclipse-mosquitto:latest
+
+# Add support tools
+RUN apk update && apk add --no-cache rsync tzdata
+
+# where IOTstack template files are stored
+ENV IOTSTACK_DEFAULTS_DIR="iotstack_defaults"
+
+# copy template files to image
+COPY --chown=mosquitto:mosquitto ${IOTSTACK_DEFAULTS_DIR} /${IOTSTACK_DEFAULTS_DIR}
+
+# replace the docker entry-point script
+ENV IOTSTACK_ENTRY_POINT="docker-entrypoint.sh"
+COPY ${IOTSTACK_ENTRY_POINT} /${IOTSTACK_ENTRY_POINT}
+RUN chmod 755 /${IOTSTACK_ENTRY_POINT}
+ENV IOTSTACK_ENTRY_POINT=
+
+# IOTstack also declares these paths
+VOLUME ["/mosquitto/config", "/mosquitto/pwfile"]
+
+# EOF