Merge pull request #1825 from pi-hole/development

dev -> master for release

Author: PromoFaux

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+*       @pi-hole/docker-maintainers"

.github/dependabot.yml

@@ -8,17 +8,13 @@ updates:
       day: saturday
       time: "10:00"
     target-branch: development
-    reviewers:
-      - "pi-hole/docker-maintainers"
   - package-ecosystem: "docker"
     directory: "/src/"
     schedule:
       interval: "weekly"
       day: saturday
       time: "10:00"
     target-branch: development
-    reviewers:
-      - "pi-hole/docker-maintainers"
   - package-ecosystem: pip
     directory: "/test"
     schedule:
@@ -27,5 +23,3 @@ updates:
       time: "10:00"
     open-pull-requests-limit: 10
     target-branch: development
-    reviewers:
-      - "pi-hole/docker-maintainers"

.github/workflows/build-and-publish.yml

@@ -22,9 +22,10 @@ jobs:
       matrix:
         platform: [linux/amd64, linux/386, linux/arm/v6, linux/arm/v7, linux/arm64]
         alpine_version: [3.19]
-        include:
-          - platform: linux/riscv64
-            alpine_version: edge
+        # RISCV is currently not working on GHA, and so FTL is unavailable for this platform.
+        # include:
+        #   - platform: linux/riscv64
+        #     alpine_version: edge
 
     steps:
       - name: Prepare name for digest up/download

README.md

@@ -25,7 +25,7 @@
 
 > [!CAUTION]
 >
-> ## !!! THE LATEST VERSION CONTAINS BREAKING CHANGES
+> ## !!! VERSIONS SINCE 2025.02.0 CONTAIN BREAKING CHANGES IF UPGRADING FROM 2024.07.0 OR OLDER
 >
 > **Pi-hole v6 has been entirely redesigned from the ground up and contains many breaking changes.**
 >
@@ -173,6 +173,13 @@ Here is a rundown of other arguments for your docker-compose / docker run.
 - Port conflicts?  Stop your server's existing DNS / Web services.
   - Don't forget to stop your services from auto-starting again after you reboot.
   - Ubuntu users see below for more detailed information.
+  - If only ports 80 and/or 443 are in use, you have two options:
+    - Change the container's port mapping by adjusting the Docker `-p` flags or the `ports:` section in the compose file. For example, change `- "80:80/tcp"` to `- "8080:80/tcp"` to expose the container’s internal HTTP port 80 as 8080 on the host.
+    - Or, when running the container in `network_mode: host`, where port mappings are not available, change the ports used by the Pi-hole web server using the `FTLCONF_webserver_port` environment variable.<br>
+      Example:<br>
+      `FTLCONF_webserver_port: '8080o,[::]:8080o,8443os,[::]:8443os'`<br>
+      This makes the web interface available on HTTP port 8080 and HTTPS port 8443 for both IPv4 and IPv6.
+    - **Note:** This only applies to web interface ports (80 and 443). DNS (53), DHCP (67), and NTP (123) ports must still be handled via Docker port mappings or host networking.
 - Docker's default network mode `bridge` isolates the container from the host's network. This is a more secure setting, but requires setting the Pi-hole DNS option for _Interface listening behavior_ to "Listen on all interfaces, permit all origins".
 - If you're using a Red Hat based distribution with an SELinux Enforcing policy, add `:z` to line with volumes.
 

build.sh

@@ -4,13 +4,13 @@
 usage() {
     echo "Usage: $0 [-l] [-f <ftl_branch>] [-c <core_branch>] [-w <web_branch>] [-t <tag>] [use_cache]"
     echo "Options:"
-    echo "  -f, --ftlbranch <branch>     Specify FTL branch (cannot be used in conjunction with -l)"
-    echo "  -c, --corebranch <branch>    Specify Core branch"
-    echo "  -w, --webbranch <branch>     Specify Web branch"
-    echo "  -p, --paddbranch <branch>    Specify PADD branch"
-    echo "  -t, --tag <tag>              Specify Docker image tag (default: pihole:local)"
-    echo "  -l, --local                  Use locally built FTL binary (requires src/pihole-FTL file)"
-    echo "  use_cache                    Enable caching (by default --no-cache is used)"
+    echo "  -f,  --ftlbranch <branch>     Specify FTL branch (cannot be used in conjunction with -l)"
+    echo "  -c,  --corebranch <branch>    Specify Core branch"    
+    echo "  -w,  --webbranch <branch>     Specify Web branch"
+    echo "  -p,  --paddbranch <branch>    Specify PADD branch"
+    echo "  -t,  --tag <tag>              Specify Docker image tag (default: pihole:local)"
+    echo "  -l,  --local                  Use locally built FTL binary (requires src/pihole-FTL file)"
+    echo "  use_cache                     Enable caching (by default --no-cache is used)"
     echo ""
     echo "If no options are specified, the following command will be executed:"
     echo "  docker buildx build src/. --tag pihole:local --load --no-cache"
@@ -21,6 +21,9 @@ usage() {
 TAG="pihole:local"
 DOCKER_BUILD_CMD="docker buildx build src/. --tag ${TAG} --load --no-cache"
 FTL_FLAG=false
+CORE_FORK="pi-hole"
+WEB_FORK="pi-hole"
+PADD_FORK="pi-hole"
 
 # Check if buildx is installed
 docker buildx version >/dev/null 2>&1
@@ -34,13 +37,14 @@ fi
 check_branch_exists() {
     local repo=$1
     local branch=$2
+    local fork=$3
     local url
 
     if [ "$repo" == "ftl" ]; then
         # Special case for FTL - we check for the binary instead of just the branch - in case it is not yet built.
         url="https://ftl.pi-hole.net/${branch}/pihole-FTL-amd64"
     else
-        url="https://github.com/pi-hole/${repo}/blob/${branch}/README.md"
+        url="https://github.com/${fork}/${repo}/blob/${branch}/README.md"
     fi
 
     local http_code
@@ -83,14 +87,14 @@ while [[ $# -gt 0 ]]; do
         ;;
     -c | --corebranch)
         CORE_BRANCH="$2"
-        check_branch_exists "pi-hole" "$CORE_BRANCH"
+        check_branch_exists "pi-hole" "$CORE_BRANCH" "$CORE_FORK"
         DOCKER_BUILD_CMD+=" --build-arg CORE_BRANCH=$CORE_BRANCH"
         shift
         shift
-        ;;
+        ;;   
     -w | --webbranch)
         WEB_BRANCH="$2"
-        check_branch_exists "web" "$WEB_BRANCH"
+        check_branch_exists "web" "$WEB_BRANCH" "$WEB_FORK"
         DOCKER_BUILD_CMD+=" --build-arg WEB_BRANCH=$WEB_BRANCH"
         shift
         shift
@@ -102,6 +106,24 @@ while [[ $# -gt 0 ]]; do
         shift
         shift
         ;;
+    -cf | --corefork)
+        CORE_FORK="$2"
+        DOCKER_BUILD_CMD+=" --build-arg CORE_FORK=$CORE_FORK"
+        shift
+        shift
+        ;;
+    -wf | --webfork)
+        WEB_FORK="$2"
+        DOCKER_BUILD_CMD+=" --build-arg WEB_FORK=$WEB_FORK"
+        shift
+        shift
+        ;;
+    -pf | --paddfork)
+        PADD_FORK="$2"
+        DOCKER_BUILD_CMD+=" --build-arg PADD_FORK=$PADD_FORK"
+        shift
+        shift
+        ;;
     -t | --tag)
         CUSTOM_TAG="$2"
         DOCKER_BUILD_CMD=${DOCKER_BUILD_CMD/$TAG/$CUSTOM_TAG}

src/Dockerfile

@@ -11,6 +11,10 @@ ARG FTL_BRANCH="development"
 ARG PIHOLE_DOCKER_TAG="dev-localbuild"
 ARG PADD_BRANCH="development"
 
+ARG CORE_FORK="pi-hole"
+ARG WEB_FORK="pi-hole"
+ARG PADD_FORK="pi-hole"
+
 ARG PIHOLE_UID=1000
 ARG PIHOLE_GID=1000
 
@@ -55,11 +59,11 @@ ADD https://ftl.pi-hole.net/macvendor.db /macvendor.db
 COPY crontab.txt /crontab.txt
 
 # Add PADD to the container, too.
-ADD --chmod=0755 https://raw.githubusercontent.com/pi-hole/PADD/${PADD_BRANCH}/padd.sh /usr/local/bin/padd
+ADD --chmod=0755 https://raw.githubusercontent.com/${PADD_FORK}/PADD/${PADD_BRANCH}/padd.sh /usr/local/bin/padd
 
 # download a the main repos from github
-RUN git clone --depth 1 --single-branch --branch ${WEB_BRANCH} https://github.com/pi-hole/web.git /var/www/html/admin && \
-    git clone --depth 1 --single-branch --branch ${CORE_BRANCH} https://github.com/pi-hole/pi-hole.git /etc/.pihole
+RUN git clone --depth 1 --single-branch --branch ${WEB_BRANCH} https://github.com/${WEB_FORK}/web.git /var/www/html/admin && \
+    git clone --depth 1 --single-branch --branch ${CORE_BRANCH} https://github.com/${CORE_FORK}/pi-hole.git /etc/.pihole
 
 RUN cd /etc/.pihole && \
     install -Dm755 -d /opt/pihole && \
@@ -97,7 +101,8 @@ RUN if   [ "$TARGETPLATFORM" = "linux/amd64" ];    then FTLARCH=amd64; \
     elif [ "$TARGETPLATFORM" = "linux/arm/v7" ];   then FTLARCH=armv7; \
     # Note for the future, "linux/arm6/v8" is not a valid value for TARGETPLATFORM, despite the CI platform name being that.
     elif [ "$TARGETPLATFORM" = "linux/arm64" ];    then FTLARCH=arm64; \
-    elif [ "$TARGETPLATFORM" = "linux/riscv64" ];  then FTLARCH=riscv64; \
+    # RISCV is currently not working on GHA, and so FTL is unavailable for this platform.
+    #elif [ "$TARGETPLATFORM" = "linux/riscv64" ];  then FTLARCH=riscv64; \
     else FTLARCH=amd64; fi \
     && echo "Arch: ${TARGETPLATFORM}, FTLARCH: ${FTLARCH}" \
     && if [ "${FTL_BRANCH}" = "master" ]; then URL="https://github.com/pi-hole/ftl/releases/latest/download"; else URL="https://ftl.pi-hole.net/${FTL_BRANCH}"; fi \

test/requirements.txt

@@ -1,5 +1,5 @@
 pytest == 8.3.5
 pytest-xdist == 3.6.1
-pytest-testinfra == 10.1.1
+pytest-testinfra == 10.2.2
 black == 25.1.0
 pytest-clarity == 1.0.1