Merge pull request #1600 from pi-hole/dev

dev -> Master

.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].1
+        uses: eps1lon/[email protected].2
         with:
           dirtyLabel: "Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

src/s6/debian-root/usr/local/bin/install.sh

@@ -17,9 +17,15 @@ detect_arch() {
     S6_ARCH="armhf";;
   armv7l)
     S6_ARCH="armhf";;
-  i386)
-    S6_ARCH="i686";;
-esac
+  x86_64)
+    # arch returns x86_64 on linux/i386, causing the wrong s6-overlay to be downloaded
+    # fallback to dpkg to check the architecture and download the i686 s6-overlay if necessary
+    # see https://github.com/pi-hole/docker-pi-hole/issues/1524 for more information
+    ARCH_CHECK=$(dpkg --print-architecture)
+    if [ "$ARCH_CHECK" == "i386" ]; then
+      S6_ARCH="i686"
+    fi    
+  esac
 }
 
 

test/Pipfile

@@ -6,9 +6,9 @@ verify_ssl = true
 [dev-packages]
 
 [packages]
-pytest = "==8.2.1"
+pytest = "==8.2.2"
 pytest-xdist = "==3.6.1"
-pytest-testinfra = "==10.1.0"
+pytest-testinfra = "==10.1.1"
 black = "==24.4.2"
 
 [requires]