From 163a7987a12aefce35e411de5f911a94ed124dad Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sat, 22 Mar 2025 12:37:37 +0100
Subject: [PATCH 01/16] Update docker_build_push_main.yml

---
 .github/workflows/docker_build_push_main.yml | 72 ++++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/docker_build_push_main.yml b/.github/workflows/docker_build_push_main.yml
index bb17a1e..d495fd9 100755
--- a/.github/workflows/docker_build_push_main.yml
+++ b/.github/workflows/docker_build_push_main.yml
@@ -1,43 +1,43 @@
-name: Build and push pihole-unbound-hyperlocal
+name: build prod image
 
 on:
   push:
     branches: [ main ]
+
 jobs:
-  build:
+  build-dev:
     runs-on: ubuntu-latest
     steps:
-    - 
-      name: Checkout
-      uses: actions/checkout@v2
-    - 
-      name: Login to Docker Hub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USER }}
-        password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-    - 
-      name: Set up variables
-      run: |
-        VER=$(cat ./docker-build/VERSION)
-        echo "VERSION=$VER" >> $GITHUB_ENV
-    -
-      name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
-    -
-      name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    -
-      name: Build and push
-      uses: docker/build-push-action@v2
-      with:
-        context: ./docker-build
-        file: ./docker-build/Dockerfile
-        platforms: |
-          linux/arm/v7
-          linux/arm64
-          linux/amd64
-        push: true
-        tags: | 
-          ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}
-          ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:latest
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Set up variables
+        run: |
+          VER=$(cat ./docker-build/VERSION)
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: ./docker-build
+          file: ./docker-build/Dockerfile
+          platforms: |
+            linux/arm/v7
+            linux/arm64
+            linux/amd64
+          push: true
+          tags: | 
+            ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}
+            ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:latest

From 942a4877f99fb4d06df807220503a5f5a3952a2f Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sat, 22 Mar 2025 19:22:46 +0000
Subject: [PATCH 02/16] add ghcr.io and remove support vor armv7

---
 .github/workflows/build_dev.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
index 8b703ed..1203edb 100755
--- a/.github/workflows/build_dev.yml
+++ b/.github/workflows/build_dev.yml
@@ -17,6 +17,13 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
+
       - name: Set up variables
         run: |
           VER=$(cat ./docker-build/VERSION)
@@ -29,15 +36,16 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: ./docker-build
           file: ./docker-build/Dockerfile
           platforms: |
-            linux/arm/v7
             linux/arm64
             linux/amd64
           push: true
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}-dev
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:dev
+            ghcr.io/${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}-dev
+            ghcr.io/${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:dev

From d934e6bc5606cd4704bc428abdd62fbfac0ef749 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sat, 22 Mar 2025 19:31:59 +0000
Subject: [PATCH 03/16] readded linux/arm/v7

---
 .github/workflows/build_dev.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
index 1203edb..46f976b 100755
--- a/.github/workflows/build_dev.yml
+++ b/.github/workflows/build_dev.yml
@@ -41,6 +41,7 @@ jobs:
           context: ./docker-build
           file: ./docker-build/Dockerfile
           platforms: |
+            linux/arm/v7
             linux/arm64
             linux/amd64
           push: true

From 44ffe913fe9a1f6700e1d664a56356bd20585e26 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sat, 22 Mar 2025 19:37:55 +0000
Subject: [PATCH 04/16] moved to ghcr.io

---
 compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose.yml b/compose.yml
index 9037d2d..46cb09d 100755
--- a/compose.yml
+++ b/compose.yml
@@ -2,8 +2,8 @@
 # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
 services:
   pihole-unbound:
-    # You can also use latest
-    image: sujiba/pihole-unbound-hyperlocal:2025.03.0
+    # You can also use latest | 2025.03.0 | dev | 2025.03.0-dev
+    image: ghcr.io/sujiba/pihole-unbound-hyperlocal:2025.03.0
     container_name: pihole-unbound
     hostname: raspi-01
     ports:

From 10ec74c4ddf07598a1740db33c702be44d861b1b Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sat, 22 Mar 2025 19:39:03 +0000
Subject: [PATCH 05/16] moved to ghcro.io

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 31a4f37..6980019 100755
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 > Read https://github.com/pi-hole/docker-pi-hole
 
 > [!tip]
-> Firstly pull the new image with `docker pull sujiba/pihole-unbound-hyperlocal:2025.03.0`.
+> Firstly pull the new image with `docker pull ghcr.io/sujiba/pihole-unbound-hyperlocal:2025.03.0`.
 > Then stop the old container. 
 > Follow the steps described bellow. For the transition you're going to have two folders
 > - old: pihole-unbound-hyperlocal

From ededc3b89b04461cc493b793402b026eb44d16df Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sun, 23 Mar 2025 01:58:33 +0100
Subject: [PATCH 06/16] Update example.pihole.env

---
 example.pihole.env | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/example.pihole.env b/example.pihole.env
index 72c1eaf..7642880 100755
--- a/example.pihole.env
+++ b/example.pihole.env
@@ -22,10 +22,6 @@ FTLCONF_dns_upstreams=127.0.0.1#5335
 # Validate DNS replies using DNSSEC?                                              
 FTLCONF_dns_dnssec = true
 
-# On which domain is the web interface served? 
-# Default value is pi.hole
-# FTLCONF_webserver_domain=pihole-01.int.exmample.com
-
 # Theme used by the Pi-hole web interface
 # default-dark | default-darker | default-light | high-contrast | high-contrast-dark | default-auto | lcars
 FTLCONF_webserver_interface_theme=default-dark

From fd2629924ad6e6f91c8975969f3b8dffa8197ec0 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sun, 23 Mar 2025 01:37:56 +0000
Subject: [PATCH 07/16] renamed docker-compose.yml, fixed typos

---
 .github/workflows/build_main.yml  |  9 +++++++++
 README.md                         | 13 +++++++------
 compose.yml => docker-compose.yml |  4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)
 rename compose.yml => docker-compose.yml (91%)

diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
index d495fd9..191bdda 100755
--- a/.github/workflows/build_main.yml
+++ b/.github/workflows/build_main.yml
@@ -17,6 +17,13 @@ jobs:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
+
       - name: Set up variables
         run: |
           VER=$(cat ./docker-build/VERSION)
@@ -41,3 +48,5 @@ jobs:
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:latest
+            ghcr.io/${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}
+            ghcr.io/${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:latest
diff --git a/README.md b/README.md
index 6980019..c6acd7e 100755
--- a/README.md
+++ b/README.md
@@ -16,15 +16,16 @@
 > Read https://github.com/pi-hole/docker-pi-hole
 
 > [!tip]
-> Firstly pull the new image with `docker pull ghcr.io/sujiba/pihole-unbound-hyperlocal:2025.03.0`.
-> Then stop the old container. 
-> Follow the steps described bellow. For the transition you're going to have two folders
+> Firstly pull the new image with `docker pull ghcr.io/sujiba/pihole-unbound-hyperlocal:latest`.
+> Next stop the old container with `docker compose down`. 
+> Follow the steps described under [First startup](#first-startup). 
+> For the upgrade transition you're going to have two folders
 > - old: pihole-unbound-hyperlocal
 > - new: pihole-unbound-hyperlocal-v6
 > 
-> When everything is running, you can delete the old folder.
+> You can delete the old folder if everything is up and running,
 
-## Overview 
+## Overview
 
 - [Pihole + Unbound + Hyperlocal](#pihole--unbound--hyperlocal)
   - [Overview](#overview)
@@ -67,7 +68,7 @@ cp example.pihole.env pihole.env
 vi pihole.env
 
 # Change the ports if you're running a reverse proxy on ports 80 and 443
-vi compose.yml
+vi docker-compose.yml
 ```
 
 Start the container
diff --git a/compose.yml b/docker-compose.yml
similarity index 91%
rename from compose.yml
rename to docker-compose.yml
index 46cb09d..6b87f61 100755
--- a/compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,8 @@
 # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
 services:
   pihole-unbound:
-    # You can also use latest | 2025.03.0 | dev | 2025.03.0-dev
-    image: ghcr.io/sujiba/pihole-unbound-hyperlocal:2025.03.0
+    # You can also use latest | yyyy.mm.x | dev | yyyy.mm.x-dev
+    image: ghcr.io/sujiba/pihole-unbound-hyperlocal:latest
     container_name: pihole-unbound
     hostname: raspi-01
     ports:

From f4bc334207dd42af2d3a317b3c9ef0116a111821 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sun, 23 Mar 2025 01:40:43 +0000
Subject: [PATCH 08/16] fix: typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c6acd7e..4580f7e 100755
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
 > - old: pihole-unbound-hyperlocal
 > - new: pihole-unbound-hyperlocal-v6
 > 
-> You can delete the old folder if everything is up and running,
+> You can delete the old folder if everything is up and running.
 
 ## Overview
 

From 6040cc2c8a9f44bc513b583fcfcc46867ac70046 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Mon, 31 Mar 2025 14:43:52 +0000
Subject: [PATCH 09/16] chore: update to docker-pihole 2025.03.1

---
 docker-build/Dockerfile | 2 +-
 docker-build/VERSION    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index 5d5adda..56dd72f 100755
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -1,5 +1,5 @@
 # Get the latest Pi-hole version
-FROM pihole/pihole:2025.03.0
+FROM pihole/pihole:2025.03.1
 
 # Install necessary programs without repository caching
 RUN apk upgrade --no-cache && \
diff --git a/docker-build/VERSION b/docker-build/VERSION
index 18caec7..d2141ef 100755
--- a/docker-build/VERSION
+++ b/docker-build/VERSION
@@ -1 +1 @@
-2025.03.0
\ No newline at end of file
+2025.03.1
\ No newline at end of file

From 7c6b94ef85fabb9a13e114404cbbb16b730f7bc0 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Fri, 4 Apr 2025 21:12:28 +0000
Subject: [PATCH 10/16] feat: update to pihole-docker 2025.04.0

---
 docker-build/Dockerfile | 4 ++--
 docker-build/VERSION    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index 56dd72f..1ac470c 100755
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -1,5 +1,5 @@
 # Get the latest Pi-hole version
-FROM pihole/pihole:2025.03.1
+FROM pihole/pihole:2025.04.0
 
 # Install necessary programs without repository caching
 RUN apk upgrade --no-cache && \
@@ -23,4 +23,4 @@ RUN install -o unbound -g unbound -Dm755 -d /var/log/unbound
 # Add unbound start up script
 COPY --chmod=0755 unbound-entrypoint.sh /usr/bin/unbound-entrypoint.sh
 
-ENTRYPOINT ["unbound-entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["unbound-entrypoint.sh"]
diff --git a/docker-build/VERSION b/docker-build/VERSION
index d2141ef..7be4d06 100755
--- a/docker-build/VERSION
+++ b/docker-build/VERSION
@@ -1 +1 @@
-2025.03.1
\ No newline at end of file
+2025.04.0
\ No newline at end of file

From ea9a0fc046ff3fd0badb2d77af23675c59a14024 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Fri, 4 Apr 2025 21:13:12 +0000
Subject: [PATCH 11/16] chore: removed FTLCONF_webserver_api_temp_unit

---
 example.pihole.env | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/example.pihole.env b/example.pihole.env
index 7642880..a073cdb 100755
--- a/example.pihole.env
+++ b/example.pihole.env
@@ -25,7 +25,3 @@ FTLCONF_dns_dnssec = true
 # Theme used by the Pi-hole web interface
 # default-dark | default-darker | default-light | high-contrast | high-contrast-dark | default-auto | lcars
 FTLCONF_webserver_interface_theme=default-dark
-
-# Which temperature unit should be used for temperatures processed by FTL?      
-# C | F | K
-FTLCONF_webserver_api_temp_unit=C

From b3000027dbe30bff8a3b41a5f6ad4a4365b6ec53 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sat, 31 May 2025 12:31:52 +0000
Subject: [PATCH 12/16] feat: update to docker-pihole 2025.05.1

---
 docker-build/Dockerfile | 2 +-
 docker-build/VERSION    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index 1ac470c..0b7327b 100755
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -1,5 +1,5 @@
 # Get the latest Pi-hole version
-FROM pihole/pihole:2025.04.0
+FROM pihole/pihole:2025.05.1
 
 # Install necessary programs without repository caching
 RUN apk upgrade --no-cache && \
diff --git a/docker-build/VERSION b/docker-build/VERSION
index 7be4d06..576dcda 100755
--- a/docker-build/VERSION
+++ b/docker-build/VERSION
@@ -1 +1 @@
-2025.04.0
\ No newline at end of file
+2025.05.1
\ No newline at end of file

From 999a7813b5b7c776cc7dfcaad721ce499e65e9c1 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Fri, 6 Jun 2025 12:53:04 +0000
Subject: [PATCH 13/16] feat: update to docker pihole version 2025.06.0

---
 docker-build/Dockerfile | 2 +-
 docker-build/VERSION    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index 0b7327b..d4cc087 100755
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -1,5 +1,5 @@
 # Get the latest Pi-hole version
-FROM pihole/pihole:2025.05.1
+FROM pihole/pihole:2025.06.0
 
 # Install necessary programs without repository caching
 RUN apk upgrade --no-cache && \
diff --git a/docker-build/VERSION b/docker-build/VERSION
index 576dcda..1d7bd9d 100755
--- a/docker-build/VERSION
+++ b/docker-build/VERSION
@@ -1 +1 @@
-2025.05.1
\ No newline at end of file
+2025.06.0
\ No newline at end of file

From d937f97092de9fc02d4622a22fd40569221d2713 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sat, 7 Jun 2025 19:38:43 +0000
Subject: [PATCH 14/16] update to docker pihole 2025.06.1

---
 docker-build/Dockerfile | 2 +-
 docker-build/VERSION    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index d4cc087..982faa4 100755
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -1,5 +1,5 @@
 # Get the latest Pi-hole version
-FROM pihole/pihole:2025.06.0
+FROM pihole/pihole:2025.06.1
 
 # Install necessary programs without repository caching
 RUN apk upgrade --no-cache && \
diff --git a/docker-build/VERSION b/docker-build/VERSION
index 1d7bd9d..94877e9 100755
--- a/docker-build/VERSION
+++ b/docker-build/VERSION
@@ -1 +1 @@
-2025.06.0
\ No newline at end of file
+2025.06.1
\ No newline at end of file

From 3527e1c228ace8e8278504a06df6872c67783ed8 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Sat, 14 Jun 2025 09:48:35 +0000
Subject: [PATCH 15/16] feat: update to pihole docker 2025.06.2

---
 docker-build/Dockerfile | 2 +-
 docker-build/VERSION    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index 982faa4..890f489 100755
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -1,5 +1,5 @@
 # Get the latest Pi-hole version
-FROM pihole/pihole:2025.06.1
+FROM pihole/pihole:2025.06.2
 
 # Install necessary programs without repository caching
 RUN apk upgrade --no-cache && \
diff --git a/docker-build/VERSION b/docker-build/VERSION
index 94877e9..ce34564 100755
--- a/docker-build/VERSION
+++ b/docker-build/VERSION
@@ -1 +1 @@
-2025.06.1
\ No newline at end of file
+2025.06.2
\ No newline at end of file

From 81b8f6c7b877827e1f2c042565170e466e91d9f9 Mon Sep 17 00:00:00 2001
From: sujiba <65259334+sujiba@users.noreply.github.com>
Date: Wed, 18 Jun 2025 12:44:02 +0000
Subject: [PATCH 16/16] chore: updated docker build and push action

---
 .github/workflows/build_dev.yml  | 3 ++-
 .github/workflows/build_main.yml | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
index 46f976b..eef3479 100755
--- a/.github/workflows/build_dev.yml
+++ b/.github/workflows/build_dev.yml
@@ -41,9 +41,10 @@ jobs:
           context: ./docker-build
           file: ./docker-build/Dockerfile
           platforms: |
+            linux/amd64
             linux/arm/v7
             linux/arm64
-            linux/amd64
+            linux/riscv64
           push: true
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}-dev
diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
index 191bdda..e59c43d 100755
--- a/.github/workflows/build_main.yml
+++ b/.github/workflows/build_main.yml
@@ -36,14 +36,15 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: ./docker-build
           file: ./docker-build/Dockerfile
           platforms: |
+            linux/amd64
             linux/arm/v7
             linux/arm64
-            linux/amd64
+            linux/riscv64
           push: true
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}