merge

.gitignore

@@ -1,3 +1,43 @@
+<<<<<<< HEAD
+# ------------------------
+# Secrets
+# ------------------------
+.env
+
+# ------------------------
+# Pi-hole data (state)
+# ------------------------
+etc-pihole/
+
+# ------------------------
+# Logs / runtime
+# ------------------------
+*.log
+logs/
+pihole.log
+
+# ------------------------
+# Docker
+# ------------------------
+*.pid
+*.sock
+
+# ------------------------
+# System / editor
+# ------------------------
+.DS_Store
+Thumbs.db
+*~
+*.swp
+*.swo
+
+# ------------------------
+# Backup / temp
+# ------------------------
+*.bak
+*.tmp
+*.old
+=======
 # ---> Go
 # If you prefer the allow list template instead of the deny list, see community template:
 # https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
@@ -25,3 +65,4 @@ go.work.sum
 # env file
 .env
 
+>>>>>>> 73708ae84e8c1661dec146bee95ba7e4322e997b

docker-compose.yaml

@@ -0,0 +1,23 @@
+services:
+  pihole:
+    image: pihole/pihole:latest
+    container_name: pihole
+    hostname: pihole
+    restart: unless-stopped
+    env_file:
+      - .env
+    ports:
+      - "53:53/tcp"
+      - "53:53/udp"
+      - "8080:80"
+    environment:
+      TZ: ${TZ}
+      WEBPASSWORD: ${WEBPASSWORD}
+      PIHOLE_DNS_: ${PIHOLE_DNS_}
+      DNSMASQ_LISTENING: all
+      FTLCONF_dns_listeningMode: all
+    volumes:
+      - ./etc-pihole:/etc/pihole
+      - /etc/dnsmasq.d:/etc/dnsmasq.d
+    cap_add:
+      - NET_ADMIN