matthias/docker_scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.vbchaos.nl/private/docker-swarm

Browse Source
This commit is contained in:
Matthias
2024-02-27 08:51:40 +00:00
parent 7ebbad6c98 9c5071e81d
commit 0b2212710d
4 changed files with 41 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compose/grafana/docker-compose.yml
+8 -10
View File
@@ -11,13 +11,13 @@ volumes:
driver_opts: driver_opts:
type: nfs type: nfs
o: addr=dockerstorage,nfsvers=4 o: addr=dockerstorage,nfsvers=4
device: :/dockerstorage/grafana/grafana device: :/docker_config/grafana/grafana
loki_data: loki_data:
driver_opts: driver_opts:
type: nfs type: nfs
o: addr=dockerstorage,nfsvers=4 o: addr=dockerstorage,nfsvers=4
device: :/dockerstorage/grafana/loki device: :/docker_config/grafana/loki
configs: configs:
prometheus_config: prometheus_config:
@@ -37,12 +37,12 @@ services:
# - "3100:3100" # - "3100:3100"
# command: -config.file=/etc/loki/local-config.yaml # command: -config.file=/etc/loki/local-config.yaml
promtail: # promtail:
image: grafana/promtail:2.6.1 # image: grafana/promtail:2.6.1
user: "0:0" # user: "0:0"
volumes: # volumes:
- /var/log:/var/log # - /var/log:/var/log
command: -config.file=/etc/promtail/config.yml # command: -config.file=/etc/promtail/config.yml
prometheus: prometheus:
user: "0:0" user: "0:0"
@@ -64,8 +64,6 @@ services:
user: "0:0" user: "0:0"
hostname: grafana hostname: grafana
image: grafana/grafana image: grafana/grafana
depends_on:
- influx
environment: environment:
- TZ=Europe/Amsterdam - TZ=Europe/Amsterdam
configs: configs:
homenetwork/dns/pihole_mason.yml
+10 -49
View File
@@ -1,78 +1,39 @@
version: "3.7" version: "3.7"
#volumes:
# pihole:
services: services:
pihole: mason-ph:
image: pihole/pihole:latest image: pihole/pihole:latest
container_name: "mason-ph" container_name: "mason-ph"
hostname: "pihole" networks:
# user: "root:root" - pihole_network
ports: ports:
- "53:53/udp" - "53:53/udp"
- "53:53/tcp" - "53:53/tcp"
- "80:80" - "80:80"
# - target: 53
# published: 53
# protocol: tcp
# - target: 53
# published: 53
# protocol: udp
# - target: 80
# published: 8053
# protocol: tcp
# network_mode: "host"
volumes: volumes:
- type: bind - type: bind
source: /pihole_data source: /pihole_data
target: /etc/pihole target: /etc/pihole
# - pihole:/etc/pihole
# - "/home/ansible/stacks/lighttpd/external.conf:/etc/lighttpd/external.conf"
# - dnsmasq:/etc/dnsmasq.d
# depends_on:
# - cloudflared
restart: always restart: always
environment: environment:
TZ: Europe/Amsterdam TZ: Europe/Amsterdam
# - "DNS1=1.1.1.1"
# - "REV_SERVER=true"
# - "REV_SERVER_CIDR=192.168.1.0/24" #Update these fields to match your environment
# - "REV_SERVER_TARGET=192.168.1.1"
# - "REV_SERVER_DOMAIN=home.local"
WEBPASSWORD: 'password' WEBPASSWORD: 'password'
# networks:
# - web
# deploy:
# mode: global
# replicas: 1
# placement:
# constraints:
# - "node.labels.dns==true"
pihole_exporter: pihole_exporter:
image: ekofr/pihole-exporter image: ekofr/pihole-exporter
container_name: pihole_exporter container_name: pihole_exporter
expose: ports:
- 9617 - 9617:9617
environment: environment:
PIHOLE_HOSTNAME: pihole PIHOLE_HOSTNAME: mason-ph
# PIHOLE_PORT: 8053
PIHOLE_PASSWORD: password PIHOLE_PASSWORD: password
INTERVAL: 30s INTERVAL: 30s
PORT: 9617 PORT: 9617
restart: always restart: always
# deploy: networks:
# labels: - pihole_network
# - "traefik.enable=false"
# mode: replicated
# replicas: 1
# placement:
# constraints:
# - "node.hostname==swarm-master"
networks: networks:
web: pihole_network:
# external: true driver: bridge
name: web
homenetwork/dns/pihole_phil.yml
+10 -49
View File
@@ -1,78 +1,39 @@
version: "3.7" version: "3.7"
#volumes:
# pihole:
services: services:
pihole: phil-ph:
image: pihole/pihole:latest image: pihole/pihole:latest
container_name: "phil-ph" container_name: "phil-ph"
hostname: "pihole" networks:
# user: "root:root" - pihole_network
ports: ports:
- "53:53/udp" - "53:53/udp"
- "53:53/tcp" - "53:53/tcp"
- "80:80" - "80:80"
# - target: 53
# published: 53
# protocol: tcp
# - target: 53
# published: 53
# protocol: udp
# - target: 80
# published: 8053
# protocol: tcp
# network_mode: "host"
volumes: volumes:
- type: bind - type: bind
source: /pihole_data source: /pihole_data
target: /etc/pihole target: /etc/pihole
# - pihole:/etc/pihole
# - "/home/ansible/stacks/lighttpd/external.conf:/etc/lighttpd/external.conf"
# - dnsmasq:/etc/dnsmasq.d
# depends_on:
# - cloudflared
restart: always restart: always
environment: environment:
TZ: Europe/Amsterdam TZ: Europe/Amsterdam
# - "DNS1=1.1.1.1"
# - "REV_SERVER=true"
# - "REV_SERVER_CIDR=192.168.1.0/24" #Update these fields to match your environment
# - "REV_SERVER_TARGET=192.168.1.1"
# - "REV_SERVER_DOMAIN=home.local"
WEBPASSWORD: 'password' WEBPASSWORD: 'password'
# networks:
# - web
# deploy:
# mode: global
# replicas: 1
# placement:
# constraints:
# - "node.labels.dns==true"
pihole_exporter: pihole_exporter:
image: ekofr/pihole-exporter image: ekofr/pihole-exporter
container_name: pihole_exporter container_name: pihole_exporter
expose: ports:
- 9617 - 9617:9617
environment: environment:
PIHOLE_HOSTNAME: pihole PIHOLE_HOSTNAME: phil-ph
# PIHOLE_PORT: 8053
PIHOLE_PASSWORD: password PIHOLE_PASSWORD: password
INTERVAL: 30s INTERVAL: 30s
PORT: 9617 PORT: 9617
restart: always restart: always
# deploy: networks:
# labels: - pihole_network
# - "traefik.enable=false"
# mode: replicated
# replicas: 1
# placement:
# constraints:
# - "node.hostname==swarm-master"
networks: networks:
web: pihole_network:
# external: true driver: bridge
name: web
homenetwork/nas/registry.yml
+13 -9
View File
@@ -2,15 +2,17 @@ version: '3'
volumes: volumes:
registrystorage: registrystorage:
driver_opts: driver: local
type: nfs driver_opts:
o: addr=dockerstorage,nfsvers=4 type: none
device: :/dockerstorage/registry o: bind
device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry
registryauth: registryauth:
driver_opts: driver: local
type: nfs driver_opts:
o: addr=dockerstorage,nfsvers=4 type: none
device: :/dockerstorage/registry/auth o: bind
device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry/auth
@@ -36,7 +38,9 @@ services:
ports: ports:
- 8082:8080 - 8082:8080
environment: environment:
- 'DOCKER_REGISTRY_URL=https://registry.vbchaos.nl' # - 'DOCKER_REGISTRY_URL=https://registry.vbchaos.nl'
- 'DOCKER_REGISTRY_URL=http://10.10.1.32:5000'
- 'PUBLIC_REGISTRY_URL=registry.vbchaos.nl' - 'PUBLIC_REGISTRY_URL=registry.vbchaos.nl'
- 'NO_SSL_VERIFICATION=true' - 'NO_SSL_VERIFICATION=true'
- 'ENABLE_DELETE_IMAGES=true' - 'ENABLE_DELETE_IMAGES=true'
- 'SECRET_KEY_BASE=69f08e9e10d29269e2dfa7f2b18eab49bd55e0c627a9d11cdab490b97a84bc46cb51e0210b7c20f9dc4ff52bcb789c1b9ca1c655ca37cc3bf94edd1fd180ef30'