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

homenetwork/dns/pihole_mason.yml

@@ -1,78 +1,39 @@
 version: "3.7"
 
-#volumes:
-#  pihole:
-
 services:
 
-  pihole:
+  mason-ph:
     image: pihole/pihole:latest
     container_name: "mason-ph"
-    hostname: "pihole"
-#    user: "root:root"
+    networks:
+      - pihole_network
     ports:
       - "53:53/udp"
       - "53:53/tcp"
       - "80:80"
-#      - target: 53
-#        published: 53
-#        protocol: tcp
-#      - target: 53
-#        published: 53
-#        protocol: udp
-#      - target: 80
-#        published: 8053
-#        protocol: tcp  
-#    network_mode: "host"
     volumes:
       - type: bind
         source: /pihole_data
         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
     environment:
       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'
-#    networks:
-#      - web
-#    deploy:
-#      mode: global
-#      replicas: 1
-#      placement:
-#        constraints:
-#          - "node.labels.dns==true"
 
   pihole_exporter:
     image: ekofr/pihole-exporter
     container_name: pihole_exporter
-    expose:
-      - 9617
+    ports:
+      - 9617:9617
     environment:
-      PIHOLE_HOSTNAME: pihole 
-#      PIHOLE_PORT: 8053
+      PIHOLE_HOSTNAME: mason-ph 
       PIHOLE_PASSWORD: password
       INTERVAL: 30s
       PORT: 9617
     restart: always
-#    deploy:
-#      labels:
-#        - "traefik.enable=false"
-#      mode: replicated
-#      replicas: 1
-#      placement:
-#        constraints:
-#          - "node.hostname==swarm-master"      
+    networks:
+      - pihole_network 
 
 networks:
-  web:
-#    external: true
-    name: web
+  pihole_network:
+    driver: bridge

homenetwork/dns/pihole_phil.yml

@@ -1,78 +1,39 @@
 version: "3.7"
 
-#volumes:
-#  pihole:
-
 services:
 
-  pihole:
+  phil-ph:
     image: pihole/pihole:latest
     container_name: "phil-ph"
-    hostname: "pihole"
-#    user: "root:root"
+    networks:
+      - pihole_network
     ports:
       - "53:53/udp"
       - "53:53/tcp"
       - "80:80"
-#      - target: 53
-#        published: 53
-#        protocol: tcp
-#      - target: 53
-#        published: 53
-#        protocol: udp
-#      - target: 80
-#        published: 8053
-#        protocol: tcp  
-#    network_mode: "host"
     volumes:
       - type: bind
         source: /pihole_data
         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
     environment:
       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'
-#    networks:
-#      - web
-#    deploy:
-#      mode: global
-#      replicas: 1
-#      placement:
-#        constraints:
-#          - "node.labels.dns==true"
 
   pihole_exporter:
     image: ekofr/pihole-exporter
     container_name: pihole_exporter
-    expose:
-      - 9617
+    ports:
+      - 9617:9617
     environment:
-      PIHOLE_HOSTNAME: pihole 
-#      PIHOLE_PORT: 8053
+      PIHOLE_HOSTNAME: phil-ph 
       PIHOLE_PASSWORD: password
       INTERVAL: 30s
       PORT: 9617
     restart: always
-#    deploy:
-#      labels:
-#        - "traefik.enable=false"
-#      mode: replicated
-#      replicas: 1
-#      placement:
-#        constraints:
-#          - "node.hostname==swarm-master"      
+    networks:
+      - pihole_network 
 
 networks:
-  web:
-#    external: true
-    name: web
+  pihole_network:
+    driver: bridge

homenetwork/nas/registry.yml

@@ -2,15 +2,17 @@ version: '3'
 
 volumes:
   registrystorage:
-      driver_opts:
-        type: nfs
-        o: addr=dockerstorage,nfsvers=4
-        device: :/dockerstorage/registry
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry
   registryauth:
-      driver_opts:
-        type: nfs
-        o: addr=dockerstorage,nfsvers=4
-        device: :/dockerstorage/registry/auth
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/registry/auth
 
 
 
@@ -36,7 +38,9 @@ services:
     ports:
       - 8082:8080
     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'
       - 'NO_SSL_VERIFICATION=true'
       - 'ENABLE_DELETE_IMAGES=true'
+      - 'SECRET_KEY_BASE=69f08e9e10d29269e2dfa7f2b18eab49bd55e0c627a9d11cdab490b97a84bc46cb51e0210b7c20f9dc4ff52bcb789c1b9ca1c655ca37cc3bf94edd1fd180ef30'