Merge pull request #1 from TheMrAnderson/dnsUpdate

Dns update

.github/workflows/docker-dev.yml

@@ -0,0 +1,24 @@
+name: Docker Image Dev - Latest
+
+on:
+  push:
+    branches: ["!master"]
+  pull_request:
+    branches: ["!master"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          tags: themranderson/pi-hole-cloudfare-doh:latest

.github/workflows/docker-prod.yml

@@ -0,0 +1,24 @@
+name: Docker Image Prod - Stable
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          tags: themranderson/pi-hole-cloudfare-doh:stable

cloudfared/config.yaml

@@ -2,5 +2,4 @@ proxy-dns: true
 proxy-dns-port: 5153
 proxy-dns-address: 127.1.1.1
 proxy-dns-upstream:
-  - https://1.1.1.1/dns-query
-  - https://1.0.0.1/dns-query
+  - ${DNS_UPSTREAM}

readme.md

@@ -2,6 +2,10 @@
 
 This was pieced together using [testdasi/pihole-with-doh](https://github.com/testdasi/pihole-with-doh) as the basis, but that project used a secondary internal Dockerfile as the base image.  I've taken what that project has done and put it into a single Dockerfile.  The official Docker Pi-Hole Docker image is combined with Cloudflared DoH client to enable DNS-over-HTTPS added to increase security and privacy. **This image is only for AMD64 machines.**
 
+## Environment Variables
+
+DNS_UPSTREAM: Comma separated list of upstream DNS servers to use.  The DNS Settings in Pi-Hole will have no effect since all DNS requests are routed over HTTPS. You can use `https://1.1.1.1/dns-query,https://1.0.0.1/dns-query` as the default settings to use Cloudfare's DNS servers or swap to `https://1.1.1.3/dns-query,https://1.0.0.3/dns-query` to use Cloudfare's servers for families which blocks adult content
+
 [Docker Hub](https://hub.docker.com/r/themranderson/pi-hole-cloudfare-doh)
 
-There is a Dependabot config to ensure as the PiHole base image is updated, this is as well.
+There is a Dependabot config to ensure as the PiHole base image is updated, this is as well to ensure this stays up to date with their security updates.