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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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 }}