chore: updated docker build and push action

Dev

.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,18 @@ 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 }}-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

.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)
@@ -29,15 +36,18 @@ 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 }}
             ${{ 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

README.md

@@ -16,15 +16,16 @@
 > 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`.
-> 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

docker-build/Dockerfile

@@ -1,5 +1,5 @@
 # Get the latest Pi-hole version
-FROM pihole/pihole:2025.03.0
+FROM pihole/pihole:2025.06.2
 
 # 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"]
+ENTRYPOINT ["unbound-entrypoint.sh"]

docker-build/VERSION

@@ -1 +1 @@
-2025.03.0
+2025.06.2

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
-    image: 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:

example.pihole.env

@@ -22,14 +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
-
-# Which temperature unit should be used for temperatures processed by FTL?      
-# C | F | K
-FTLCONF_webserver_api_temp_unit=C