Skip to content

Commit a150dc8

Browse files
SlykeSlyke
authored
Merge pull request #714 from Paraphraser/20230614-yamllint-old-menu
2023-06-14 yamllint - old-menu branch - PR 2 of 2
2 parents 0bd4ad8 + 38c500e commit a150dc8

File tree

16 files changed

+88
-66
lines changed

16 files changed

+88
-66
lines changed

‎.templates/adguardhome/service.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
image: adguard/adguardhome
44
restart: unless-stopped
55
environment:
6-
- TZ=Etc/UTC
6+
- TZ=${TZ:-Etc/UTC}
77
# enable host mode to activate DHCP server on ports 67/udp & 68/tcp+udp
88
# note that you must also disable all other ports if you enable host mode
99
# network_mode: host
@@ -28,5 +28,6 @@
2828
# - "5443:5443/tcp"
2929
# - "5443:5443/udp"
3030
volumes:
31-
- ./volumes/adguardhome/workdir:/opt/adguardhome/work
32-
- ./volumes/adguardhome/confdir:/opt/adguardhome/conf
31+
- ./volumes/adguardhome/workdir:/opt/adguardhome/work
32+
- ./volumes/adguardhome/confdir:/opt/adguardhome/conf
33+

‎.templates/chronograf/service.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
image: chronograf:latest
44
restart: unless-stopped
55
environment:
6-
- TZ=Etc/UTC
7-
# see https://docs.influxdata.com/chronograf/v1.9/administration/config-options/
6+
- TZ=${TZ:-Etc/UTC}
7+
# see https://docs.influxdata.com/chronograf/v1.9/administration/config-options/
88
- INFLUXDB_URL=http://influxdb:8086
9-
# - INFLUXDB_USERNAME=
10-
# - INFLUXDB_PASSWORD=
11-
# - INFLUXDB_ORG=
12-
# - KAPACITOR_URL=http://kapacitor:9092
9+
# - INFLUXDB_USERNAME=
10+
# - INFLUXDB_PASSWORD=
11+
# - INFLUXDB_ORG=
12+
# - KAPACITOR_URL=http://kapacitor:9092
1313
ports:
1414
- "8888:8888"
1515
volumes:
1616
- ./volumes/chronograf:/var/lib/chronograf
1717
depends_on:
1818
- influxdb
19-
# - kapacitor
19+
# - kapacitor
20+

‎.templates/diyhue/service.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
env_file:
1111
- ./services/diyhue/diyhue.env
1212
volumes:
13-
- ./volumes/diyhue:/opt/hue-emulator/export
13+
- ./volumes/diyhue:/opt/hue-emulator/export
1414
restart: unless-stopped
15+

‎.templates/dozzle/service.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
dozzle:
22
container_name: dozzle
3-
image: amir20/dozzle:latest
3+
image: amir20/dozzle:latest
44
restart: unless-stopped
55
network_mode: host
6-
#ports:
7-
# - "8888:8080"
6+
x-ports:
7+
- "8888:8080"
88
volumes:
99
- /var/run/docker.sock:/var/run/docker.sock
10+

‎.templates/kapacitor/service.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
image: kapacitor:1.5
44
restart: unless-stopped
55
environment:
6-
- TZ=Etc/UTC
7-
# see https://docs.influxdata.com/kapacitor/v1.6/administration/configuration/#kapacitor-environment-variables
6+
- TZ=${TZ:-Etc/UTC}
7+
# see https://docs.influxdata.com/kapacitor/v1.6/administration/configuration/#kapacitor-environment-variables
88
- KAPACITOR_INFLUXDB_0_URLS_0=http://influxdb:8086
9-
# - KAPACITOR_INFLUXDB_USERNAME=
10-
# - KAPACITOR_INFLUXDB_PASSWORD=
11-
# - KAPACITOR_HOSTNAME=kapacitor
12-
# - KAPACITOR_LOGGING_LEVEL=INFO
13-
# - KAPACITOR_REPORTING_ENABLED=false
9+
# - KAPACITOR_INFLUXDB_USERNAME=
10+
# - KAPACITOR_INFLUXDB_PASSWORD=
11+
# - KAPACITOR_HOSTNAME=kapacitor
12+
# - KAPACITOR_LOGGING_LEVEL=INFO
13+
# - KAPACITOR_REPORTING_ENABLED=false
1414
ports:
1515
- "9092:9092"
1616
volumes:
1717
- ./volumes/kapacitor:/var/lib/kapacitor
1818
depends_on:
1919
- influxdb
20+

‎.templates/mosquitto/service.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
build:
44
context: ./.templates/mosquitto/.
55
args:
6-
- MOSQUITTO_BASE=eclipse-mosquitto:latest
6+
- MOSQUITTO_BASE=eclipse-mosquitto:latest
77
restart: unless-stopped
88
environment:
9-
- TZ=Etc/UTC
9+
- TZ=${TZ:-Etc/UTC}
1010
ports:
1111
- "1883:1883"
1212
volumes:
1313
- ./volumes/mosquitto/config:/mosquitto/config
1414
- ./volumes/mosquitto/data:/mosquitto/data
1515
- ./volumes/mosquitto/log:/mosquitto/log
1616
- ./volumes/mosquitto/pwfile:/mosquitto/pwfile
17+

‎.templates/openhab/service.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
- OPENHAB_HTTP_PORT=4050
1414
- OPENHAB_HTTPS_PORT=4051
1515
- EXTRA_JAVA_OPTS=-Duser.timezone=Etc/UTC
16-
# logging:
17-
# options:
18-
# max-size: "5m"
19-
# max-file: "3"
16+
x-logging:
17+
options:
18+
max-size: "5m"
19+
max-file: "3"
20+

‎.templates/pgadmin4/service.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
container_name: pgadmin4
33
image: gpongelli/pgadmin4-arm:latest-armv7
44
platform: linux/arm/v7
5-
# image: gpongelli/pgadmin4-arm:latest-armv8
5+
# image: gpongelli/pgadmin4-arm:latest-armv8
66
restart: unless-stopped
77
environment:
8-
- TZ=${TZ:-Etc/UTC}
8+
- TZ=${TZ:-Etc/UTC}
99
ports:
10-
- "5050:5050"
10+
- "5050:5050"
1111
volumes:
12-
- ./volumes/pgadmin4:/pgadmin4
12+
- ./volumes/pgadmin4:/pgadmin4
13+

‎.templates/plex/service.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
- PUID=1000
77
- PGID=1000
88
- VERSION=docker
9-
#- UMASK_SET=022 #optional
9+
# - UMASK_SET=022 #optional
1010
volumes:
1111
- ./volumes/plex/config:/config
12-
#- ~/mnt/HDD/tvseries:/tv
13-
#- ~/mnt/HDD/movies:/movies
12+
# - ~/mnt/HDD/tvseries:/tv
13+
# - ~/mnt/HDD/movies:/movies
1414
- ./volumes/plex/transcode:/transcode
1515
restart: unless-stopped
16+

‎.templates/python/service.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
build: ./services/python/.
44
restart: unless-stopped
55
environment:
6-
- TZ=Etc/UTC
6+
- TZ=${TZ:-Etc/UTC}
77
- IOTSTACK_UID=1000
88
- IOTSTACK_GID=1000
9-
# ports:
10-
# - "external:internal"
9+
x-ports:
10+
- "external:internal"
1111
volumes:
1212
- ./volumes/python/app:/usr/src/app
13+

0 commit comments

Comments
 (0)