1
0
Fork 0
mirror of https://github.com/sujiba/pihole-unbound-hyperlocal.git synced 2025-07-12 06:25:44 +02:00

Compare commits

..

No commits in common. "main" and "2025.03.0-dev" have entirely different histories.

7 changed files with 23 additions and 36 deletions

View file

@ -17,13 +17,6 @@ jobs:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }} 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 - name: Set up variables
run: | run: |
VER=$(cat ./docker-build/VERSION) VER=$(cat ./docker-build/VERSION)
@ -36,18 +29,15 @@ jobs:
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Build and push - name: Build and push
uses: docker/build-push-action@v6 uses: docker/build-push-action@v2
with: with:
context: ./docker-build context: ./docker-build
file: ./docker-build/Dockerfile file: ./docker-build/Dockerfile
platforms: | platforms: |
linux/amd64
linux/arm/v7 linux/arm/v7
linux/arm64 linux/arm64
linux/riscv64 linux/amd64
push: true push: true
tags: | tags: |
${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}-dev ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}-dev
${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal: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

View file

@ -17,13 +17,6 @@ jobs:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_ACCESS_TOKEN }} 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 - name: Set up variables
run: | run: |
VER=$(cat ./docker-build/VERSION) VER=$(cat ./docker-build/VERSION)
@ -36,18 +29,15 @@ jobs:
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Build and push - name: Build and push
uses: docker/build-push-action@v6 uses: docker/build-push-action@v2
with: with:
context: ./docker-build context: ./docker-build
file: ./docker-build/Dockerfile file: ./docker-build/Dockerfile
platforms: | platforms: |
linux/amd64
linux/arm/v7 linux/arm/v7
linux/arm64 linux/arm64
linux/riscv64 linux/amd64
push: true push: true
tags: | tags: |
${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }} ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}
${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:latest ${{ 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

View file

@ -16,14 +16,13 @@
> Read https://github.com/pi-hole/docker-pi-hole > Read https://github.com/pi-hole/docker-pi-hole
> [!tip] > [!tip]
> Firstly pull the new image with `docker pull ghcr.io/sujiba/pihole-unbound-hyperlocal:latest`. > Firstly pull the new image with `docker pull sujiba/pihole-unbound-hyperlocal:2025.03.0`.
> Next stop the old container with `docker compose down`. > Then stop the old container.
> Follow the steps described under [First startup](#first-startup). > Follow the steps described bellow. For the transition you're going to have two folders
> For the upgrade transition you're going to have two folders
> - old: pihole-unbound-hyperlocal > - old: pihole-unbound-hyperlocal
> - new: pihole-unbound-hyperlocal-v6 > - new: pihole-unbound-hyperlocal-v6
> >
> You can delete the old folder if everything is up and running. > When everything is running, you can delete the old folder.
## Overview ## Overview
@ -68,7 +67,7 @@ cp example.pihole.env pihole.env
vi pihole.env vi pihole.env
# Change the ports if you're running a reverse proxy on ports 80 and 443 # Change the ports if you're running a reverse proxy on ports 80 and 443
vi docker-compose.yml vi compose.yml
``` ```
Start the container Start the container

View file

@ -2,8 +2,8 @@
# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/ # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
services: services:
pihole-unbound: pihole-unbound:
# You can also use latest | yyyy.mm.x | dev | yyyy.mm.x-dev # You can also use latest
image: ghcr.io/sujiba/pihole-unbound-hyperlocal:latest image: sujiba/pihole-unbound-hyperlocal:2025.03.0
container_name: pihole-unbound container_name: pihole-unbound
hostname: raspi-01 hostname: raspi-01
ports: ports:

View file

@ -1,5 +1,5 @@
# Get the latest Pi-hole version # Get the latest Pi-hole version
FROM pihole/pihole:2025.06.2 FROM pihole/pihole:2025.03.0
# Install necessary programs without repository caching # Install necessary programs without repository caching
RUN apk upgrade --no-cache && \ RUN apk upgrade --no-cache && \

View file

@ -1 +1 @@
2025.06.2 2025.03.0

View file

@ -22,6 +22,14 @@ FTLCONF_dns_upstreams=127.0.0.1#5335
# Validate DNS replies using DNSSEC? # Validate DNS replies using DNSSEC?
FTLCONF_dns_dnssec = true 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 # Theme used by the Pi-hole web interface
# default-dark | default-darker | default-light | high-contrast | high-contrast-dark | default-auto | lcars # default-dark | default-darker | default-light | high-contrast | high-contrast-dark | default-auto | lcars
FTLCONF_webserver_interface_theme=default-dark 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