Merge pull request #1915 from pi-hole/development

Development -> master

Author: PromoFaux

.editorconfig

@@ -0,0 +1,20 @@
+# EditorConfig is awesome: https://editorconfig.org/
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = tab
+tab_width = 4
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.yml]
+tab_width = 2
+
+[*.md]
+tab_width = 2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,31 +12,31 @@ assignees: ''
 
 <!-- IMPORTANT Complete the entire template please, the info gathered here is usually needed to debug issues anyway so it saves time in the long run. Incomplete/stock template issues may be closed -->
 
-<!-- pick ONE: Bug, 
-               Feature Request, 
-               Run Issue (running Pi-hole container failing), 
-               Build Issue (Building image failing) 
+<!-- pick ONE: Bug,
+               Feature Request,
+               Run Issue (running Pi-hole container failing),
+               Build Issue (Building image failing)
 Enter in line below: -->
-This is a: **FILL ME IN**  
+This is a: **FILL ME IN**
 
 
 ## Details
 <!-- Provide a more detailed introduction to the issue or feature, try not to duplicate info from lower sections by reviewing the entire template first -->
 
 ## Related Issues
-- [ ] I have searched this repository/Pi-hole forums for existing issues and pull requests that look similar 
+- [ ] I have searched this repository/Pi-hole forums for existing issues and pull requests that look similar
 <!-- Add links below! -->
 
 <!------- FEATURE REQUESTS CAN STOP FILLING IN TEMPLATE HERE -------->
 <!------- ISSUES SHOULD FILL OUT REMAINDER OF TEMPLATE -------->
 
-## How to reproduce the issue 
+## How to reproduce the issue
 
 1. Environment data
   * Operating System: **ENTER HERE** <!-- Debian, Ubuntu, Rasbian, etc -->
   * Hardware: <!-- PC, RasPi B/2B/3B/4B, Mac, Synology, QNAP, etc -->
   * Kernel Architecture: <!-- x86/amd64, ArmV7, ArmV8 32bit, ArmV8 64bit, etc -->
-  * Docker Install Info and version: 
+  * Docker Install Info and version:
     - Software source: <!-- official docker-ce, OS provided package, Hypriot -->
     - Supplimentary Software: <!-- synology, portainer, etc -->
   * Hardware architecture: <!-- ARMv7, x86 -->

.github/ISSUE_TEMPLATE/config.yml

@@ -9,4 +9,4 @@ contact_links:
   - name: Documentation
     url: https://docs.pi-hole.net
     about: Documentation and guides.
-    
+

.github/dependabot.yml

@@ -2,7 +2,7 @@ version: 2
 updates:
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
-    directories: 
+    directories:
       - "/"
     schedule:
       interval: "weekly"

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

@@ -12,7 +12,7 @@ on:
 env:
   dockerhub: ${{ secrets.DOCKERHUB_NAMESPACE }}/pihole
   ghcr: ghcr.io/${{ github.repository_owner }}/pihole
-  components_branch: ${{ github.event_name == 'schedule' && 'development' || 'master' }}
+  components_branch: ${{ github.event_name == 'release' && 'master' || 'development' }}
 
 jobs:
   build:
@@ -33,72 +33,77 @@ jobs:
             runner: ubuntu-24.04-arm
           - platform: linux/riscv64
             runner: ubuntu-24.04-arm
-          
+
     steps:
       - name: Prepare name for digest up/download
         run: |
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
 
-      - name: Checkout Repo
+      - &checkout-repo
+        name: Checkout Repo
         if: github.event_name != 'schedule'
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
 
-      - name: Checkout dev branch if scheduled
+      - &checkout-dev
+        name: Checkout dev branch if scheduled
         if: github.event_name == 'schedule'
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
         with:
           ref: development
 
-      - name: Docker meta
+      - &docker-meta
+        name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f #v5.8.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           images: |
             ${{ env.dockerhub }}
-            ${{ env.ghcr }}            
+            ${{ env.ghcr }}
           flavor: |
             latest=${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
             type=schedule,pattern=nightly
-            type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
+            type=raw,value=nightly,enable=${{ github.event_name == 'push' }}
             type=ref,event=tag
 
-      -
+      - &login-dockerhub
         name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef #v3.6.0
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PASS }}
-      -
+
+      - &login-ghcr
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef #v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 #v3.6.0
         with:
           platforms: ${{ matrix.platform}}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - &setup-buildx
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 #v3.11.1
 
       - name: Build container and push by digest
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 #v6.18.0
         with:
           context: ./src/
           platforms: ${{ matrix.platform }}
           build-args: |
-            PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}            
+            PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}
             FTL_BRANCH=${{ env.components_branch }}
             CORE_BRANCH=${{ env.components_branch }}
-            WEB_BRANCH=${{ env.components_branch }}            
+            WEB_BRANCH=${{ env.components_branch }}
             PADD_BRANCH=${{ env.components_branch }}
           labels: ${{ steps.meta.outputs.labels }}
           outputs: |
@@ -111,7 +116,7 @@ jobs:
           touch "/tmp/digests/${digest_docker#sha256:}"
 
       - name: Upload digest
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 #v5.0.0
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
@@ -126,55 +131,20 @@ jobs:
     needs:
       - build
     steps:
-      - name: Checkout Repo
-        if: github.event_name != 'schedule'
-        uses: actions/checkout@v4
-
-      - name: Checkout dev branch if scheduled
-        if: github.event_name == 'schedule'
-        uses: actions/checkout@v4
-        with:
-          ref: development
+      - *checkout-repo
+      - *checkout-dev
 
       - name: Download digests
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 #v6.0.0
         with:
           path: /tmp/digests
           pattern: digests-*
           merge-multiple: true
-      
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          images: |
-            ${{ env.dockerhub }}
-            ${{ env.ghcr }}
-          flavor: |
-            latest=${{ startsWith(github.ref, 'refs/tags/') }}
-          tags: |
-            type=schedule,pattern=nightly
-            type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
-            type=ref,event=tag
 
-      -
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_PASS }}
-      -
-        name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+      - *setup-buildx
+      - *docker-meta
+      - *login-dockerhub
+      - *login-ghcr
 
       - name: Create manifest list and push (DockerHub and GitHub Container Registry)
         working-directory: /tmp/digests
@@ -187,4 +157,4 @@ jobs:
       - name: Inspect images
         run: |
           docker buildx imagetools inspect ${{ env.dockerhub }}:${{ steps.meta.outputs.version }}
-          docker buildx imagetools inspect ${{ env.ghcr }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.ghcr }}:${{ steps.meta.outputs.version }}

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

@@ -25,16 +25,16 @@ jobs:
       CI_ARCH: ${{ matrix.platform }}
     steps:
     - name: Checkout Repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 #v3.6.0
 
     - name: Set up Python
-      uses: actions/setup-python@v5.6.0
+      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c #v6.0.0
       with:
         python-version: "3.13"
-    
+
     - name: Run black formatter
       run: |
         pip install black

.github/workflows/codespell.yml

@@ -10,9 +10,9 @@ jobs:
     steps:
     -
       name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
     -
       name: Spell-Checking
-      uses: codespell-project/actions-codespell@master
+      uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 #v2.1
       with:
         ignore_words_file: .codespellignore

.github/workflows/editorconfig.yml

@@ -0,0 +1,18 @@
+name: Editorconfig-Checker
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  editorconfig-checker:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
+
+    - name: Get editorconfig-checker
+      uses: editorconfig-checker/action-editorconfig-checker@4b6cd6190d435e7e084fb35e36a096e98506f7b9 # tag v2. is really out of date
+
+    - name: Run editorconfig-checker
+      run: editorconfig-checker

.github/workflows/housekeeping.yml

@@ -1,18 +1,20 @@
-name: housekeeping
+name: Remove untagged images from registry
 on:
-  workflow_dispatch:
+    workflow_dispatch:
+    schedule:
+        - cron: "0 0 * * *"
 
 jobs:
     housekeeping:
         runs-on: ubuntu-latest
         steps:
             -
                 name: Delete all containers from repository without tags
-                uses: Chizkiyahu/delete-untagged-ghcr-action@v6
+                uses: Chizkiyahu/delete-untagged-ghcr-action@68758dd8caf1d9dbaed1fe9cc1a1f8fcea1c4cf0 #v6.1.0
                 with:
                     token: ${{ secrets.PAT_TOKEN }}
                     repository_owner: ${{ github.repository_owner }}
                     repository: ${{ github.repository }}
                     untagged_only: true
                     owner_type: org # or user
-                    except_untagged_multiplatform: true
+                    except_untagged_multiplatform: true

.github/workflows/merge-conflict.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if PRs are have merge conflicts
-        uses: eps1lon/[email protected]
+        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 #v3.0.3
         with:
           dirtyLabel: "Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"