Skip to content

Commit 383d213

Browse files
committed
Merge remote-tracking branch 'upstream/master' into HEAD
# Conflicts: # .github/workflows/main.yml # docs/Containers/Blynk_server.md # docs/Containers/Home-Assistant.md # docs/Containers/Node-RED.md # docs/Containers/Prometheus.md
2 parents c614c20 + d1155e1 commit 383d213

35 files changed

+172
-321
lines changed

.native/hassio_supervisor.sh

Lines changed: 0 additions & 51 deletions
This file was deleted.

.templates/deconz/hardware_list.yml

100755100644
File mode changed.

.templates/env.yml

100755100644
File mode changed.

.templates/example_template/example_service.yml

100755100644
File mode changed.

.templates/home_assistant/service.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@ home_assistant:
88
volumes:
99
- /etc/localtime:/etc/localtime:ro
1010
- ./volumes/home_assistant:/config
11-
11+
- /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
12+
devices:
13+
- "/dev/ttyAMA0:/dev/ttyAMA0"
14+
- "/dev/vcio:/dev/vcio"
15+
- "/dev/gpiomem:/dev/gpiomem"
16+
privileged: true

.templates/influxdb/terminal.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ echo "to exit type: EXIT"
1212
echo ""
1313
echo "docker exec -it influxdb influx"
1414

15-
docker exec -it influxdb influx
15+
docker exec -it influxdb influx "$@"

.templates/nodered/addons.yml

100755100644
File mode changed.

.templates/prometheus-cadvisor/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prometheus-cadvisor:
2-
container_name: cadvisor
2+
container_name: prometheus-cadvisor
33
image: zcube/cadvisor:latest
44
restart: unless-stopped
55
ports:

.templates/prometheus-nodeexporter/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prometheus-nodeexporter:
2-
container_name: nodeexporter
2+
container_name: prometheus-nodeexporter
33
image: prom/node-exporter:latest
44
restart: unless-stopped
55
expose:

.templates/prometheus/service.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ prometheus:
1818
# - --web.console.libraries=/usr/share/prometheus/console_libraries
1919
# - --web.console.templates=/usr/share/prometheus/consoles
2020
depends_on:
21-
- cadvisor
22-
- nodeexporter
21+
- prometheus-cadvisor
22+
- prometheus-nodeexporter
2323

0 commit comments

Comments
 (0)