alias

pihole/docker-compose.yml

@@ -1,80 +1,61 @@
----
-services:
+networks:
   pihole:
-    container_name: pihole
-    image: pihole/pihole:latest
-    hostname: m-server
-    ports:
-      # DNS Ports
-      - "53:53/tcp"
-      - "53:53/udp"
-      # Default HTTP Port
-      - "9380:80/tcp"
-      # Default HTTPs Port. FTL will generate a self-signed certificate
-      - "9343:443/tcp"
-      # Uncomment the below if using Pi-hole as your DHCP Server
-      #- "67:67/udp"
+    driver: bridge
+    ipam:
+      config:
+      - subnet: 192.168.78.0/24
+      driver: default
+services:
+  orbital-sync:
     environment:
-      # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
-      TZ: 'Europe/Bratislava'
-      # Set a password to access the web interface. Not setting one will result in a random password being assigned
-      FTLCONF_webserver_api_password: ${PASSWORD}
-      FTLCONF_dns_upstreams: 8.8.8.8;8.8.4.4
-      FTLCONF_dns_listeningMode: all
-    # Volumes store your data between container upgrades
-    volumes:
-      # For persisting Pi-hole's databases and common configuration file
-      - '/share/docker_data/pihole/etc-pihole:/etc/pihole'
-      - '/share/docker_data/pihole/etc-dnsmasq.d:/etc/dnsmasq.d'
-      # Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards. Needs environment variable FTLCONF_misc_etc_dnsmasq_d: 'true'
-      #- './etc-dnsmasq.d:/etc/dnsmasq.d'
-    cap_add:
-      # See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
-      # Required if you are using Pi-hole as your DHCP server, else not needed
-      - NET_ADMIN
-      # Required if you are using Pi-hole as your NTP client to be able to set the host's system time
-      - SYS_TIME
-      # Optional, if Pi-hole should get some more processing time
-      - SYS_NICE
-    restart: unless-stopped
-    #network_mode: host
+      INTERVAL_MINUTES: 60
+      PRIMARY_HOST_BASE_URL: http://192.168.77.101:9380
+      PRIMARY_HOST_PASSWORD: ${PASSWORD}
+      SECONDARY_HOSTS_1_BASE_URL: http://192.168.77.106:9380
+      SECONDARY_HOSTS_1_PASSWORD: ${PASSWORD}
+      SECONDARY_HOSTS_1_PATH: /admin
+      SECONDARY_HOSTS_2_BASE_URL: http://192.168.77.238:9380
+      SECONDARY_HOSTS_2_PASSWORD: ${PASSWORD}
+    image: mattwebbio/orbital-sync:1
     labels:
-      - com.centurylinklabs.watchtower.enable=true
-      - homepage.group=Infrastructure
-      - homepage.name=Pihole
-      - homepage.weight=1
-      - homepage.icon=/images/pihole.png
-      - homepage.href=https://active.home.lan:9343/admin
-      - homepage.description=Add blocker
-      - homepage.server=my-docker
-      - homepage.container=pihole
-      - homepage.widget.type=pihole
-      - homepage.widget.url=https://active.home.lan:9343
-      - homepage.widget.password=${PASSWORD}
-      - homepage.widget.version=6
+      wud.watch.digest: true
+  pihole:
+    cap_add:
+    - NET_ADMIN
+    - SYS_TIME
+    - SYS_NICE
+    container_name: pihole
+    environment:
+      FTLCONF_dns_listeningMode: all
+      FTLCONF_dns_upstreams: 8.8.8.8;8.8.4.4
+      FTLCONF_webserver_api_password: ${PASSWORD}
+      TZ: Europe/Bratislava
+    hostname: m-server
+    image: pihole/pihole:latest
+    labels:
+      com.centurylinklabs.watchtower.enable: 'true'
+      homepage.container: pihole
+      homepage.description: Add blocker
+      homepage.group: Infrastructure
+      homepage.href: https://active.home.lan:9343/admin
+      homepage.icon: /images/pihole.png
+      homepage.name: Pihole
+      homepage.server: my-docker
+      homepage.weight: '1'
+      homepage.widget.password: ${PASSWORD}
+      homepage.widget.type: pihole
+      homepage.widget.url: https://active.home.lan:9343
+      homepage.widget.version: '6'
+      wud.watch.digest: true
     networks:
       pihole:
         ipv4_address: 192.168.78.254
-  orbital-sync:
-    image: mattwebbio/orbital-sync:1
-    environment:
-      PRIMARY_HOST_BASE_URL: 'http://192.168.77.101:9380'
-      PRIMARY_HOST_PASSWORD: ${PASSWORD}
-      #PRIMARY_HOST_PATH: /admin
-      SECONDARY_HOSTS_1_BASE_URL: 'http://192.168.77.106:9380'
-      SECONDARY_HOSTS_1_PASSWORD: ${PASSWORD}
-      SECONDARY_HOSTS_1_PATH: /admin
-      SECONDARY_HOSTS_2_BASE_URL: 'http://192.168.77.238:9380'
-      SECONDARY_HOSTS_2_PASSWORD: ${PASSWORD}
-      # SECONDARY_HOSTS_3_BASE_URL: 'http://server:8080'
-      # SECONDARY_HOSTS_3_PASSWORD: 'your_password4'
-      # SECONDARY_HOSTS_3_PATH: '/apps/pi-hole'
-      INTERVAL_MINUTES: 60
-
-networks:
-  pihole: # here we set the network name
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-      - subnet:  192.168.78.0/24
+    ports:
+    - 53:53/tcp
+    - 53:53/udp
+    - 9380:80/tcp
+    - 9343:443/tcp
+    restart: unless-stopped
+    volumes:
+    - /share/docker_data/pihole/etc-pihole:/etc/pihole
+    - /share/docker_data/pihole/etc-dnsmasq.d:/etc/dnsmasq.d