Merge branch 'dev'

.github/workflows/codespell.yml

@@ -0,0 +1,18 @@
+name: Codespell
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  spell-check:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+    -
+      name: Checkout repository
+      uses: actions/checkout@v3
+    -
+      name: Spell-Checking
+      uses: codespell-project/actions-codespell@master
+      with:
+        ignore_words_file: .codespellignore

README.md

@@ -9,15 +9,18 @@
 
 - **Using Watchtower? See the [Note on Watchtower](#note-on-watchtower) at the bottom of this readme**
 
-- You may run into issues running `2022.04` and later on `buster`-based host systems due to [a known issue with Seccomp](https://github.com/moby/moby/issues/40734). The first recommendation is to upgrade your host OS to `bullseye`, which includes a more up to date (and fixed) version of `libseccomp2`.  
- _If you absolutley cannot do this, some users [have reported](https://github.com/pi-hole/docker-pi-hole/issues/1042#issuecomment-1086728157) success in updating `libseccomp2` via backports. You can try this workaround at your own risk_  
+- Due to [a known issue with Docker and libseccomp <2.5](https://github.com/moby/moby/issues/40734), you may run into issues running `2022.04` and later on host systems with an older version of `libseccomp2` ([Such as Debian/Raspbian buster or Ubuntu 20.04](https://pkgs.org/download/libseccomp2), and maybe [CentOS 7](https://pkgs.org/download/libseccomp)). 
+
+  The first recommendation is to upgrade your host OS, which will include a more up to date (and fixed) version of `libseccomp`. 
+  
+  _If you absolutely cannot do this, some users [have reported](https://github.com/pi-hole/docker-pi-hole/issues/1042#issuecomment-1086728157) success in updating `libseccomp2` via backports on debian, or similar via updates on Ubuntu. You can try this workaround at your own risk_  
 
 - Some users [have reported issues](https://github.com/pi-hole/docker-pi-hole/issues/963#issuecomment-1095602502) with using the `--privileged` flag on `2022.04` and above. TL;DR, don't use that that mode, and be [explicit with the permitted caps](https://github.com/pi-hole/docker-pi-hole#note-on-capabilities) (if needed) instead
 
 - As of `2022.04.01`, setting `CAP_NET_ADMIN` is only required if you are using Pi-hole as your DHCP server. The container will only try to set caps that are explicitly granted (or natively available)
 
 - In `2022.01` and later, the default `DNSMASQ_USER` has been changed to `pihole`, however this may cause issues on some systems such as Synology, see Issue [#963](https://github.com/pi-hole/docker-pi-hole/issues/963) for more information.  
- If the container wont start due to issues setting capabilities, set `DNSMASQ_USER` to `root` in your environment.
+ If the container won't start due to issues setting capabilities, set `DNSMASQ_USER` to `root` in your environment.
 
 ## Quick Start
 

bash_functions.sh

@@ -56,7 +56,7 @@ prepare_configs() {
     
     chown pihole:root /etc/lighttpd
     
-    # In case of `pihole` UID being changed, re-chown the pihole scripts and pihole commmand
+    # In case of `pihole` UID being changed, re-chown the pihole scripts and pihole command
     chown -R pihole:root "${PI_HOLE_INSTALL_DIR}"
     chown pihole:root "${PI_HOLE_BIN_DIR}/pihole"
     
@@ -83,7 +83,7 @@ validate_env() {
     # Optional IPv6 is a valid address
     if [[ -n "$ServerIPv6" ]] ; then
         if [[ "$ServerIPv6" == 'kernel' ]] ; then
-            echo "ERROR: You passed in IPv6 with a value of 'kernel', this maybe beacuse you do not have IPv6 enabled on your network"
+            echo "ERROR: You passed in IPv6 with a value of 'kernel', this maybe because you do not have IPv6 enabled on your network"
             unset ServerIPv6
             exit 1
         fi

start.sh

@@ -149,7 +149,7 @@ if [ -n "${PIHOLE_DNS_}" ]; then
     done
 
     if [ $valid_entries -eq 0 ]; then
-      echo "No Valid entries dectected in PIHOLE_DNS_. Aborting"
+      echo "No Valid entries detected in PIHOLE_DNS_. Aborting"
       exit 1
     fi
 else

test/conftest.py

@@ -41,7 +41,7 @@ def args(args_volumes, args_env):
 
 @pytest.fixture()
 def test_args():
-    ''' test override fixture to provide arguments seperate from our core args '''
+    ''' test override fixture to provide arguments separate from our core args '''
     return ''
 
 def DockerGeneric(request, _test_args, _args, _image, _cmd, _entrypoint):
@@ -76,7 +76,7 @@ def DockerPersist(request, persist_test_args, persist_args, persist_image, persi
     ''' Persistent Docker container for multiple tests, instead of stopping container after one test '''
     ''' Uses DUP'd module scoped fixtures because smaller scoped fixtures won't mix with module scope '''
     persistent_container = DockerGeneric(request, persist_test_args, persist_args, persist_image, persist_cmd, persist_entrypoint)
-    ''' attach a dig conatiner for lookups '''
+    ''' attach a dig container for lookups '''
     persistent_container.dig = Dig(persistent_container.id)
     return persistent_container
 
@@ -145,7 +145,7 @@ def persist_args(persist_args_volumes, persist_args_env):
 
 @pytest.fixture(scope='module')
 def persist_test_args():
-    ''' test override fixture to provide arguments seperate from our core args '''
+    ''' test override fixture to provide arguments separate from our core args '''
     return ''
 
 @pytest.fixture(scope='module')

tox.ini

@@ -4,7 +4,7 @@ envlist = py38
 [testenv]
 commands = echo "Use ./gh-actions-test.sh instead for now"
 
-# Currently out of comission post-python3 upgrade due to failed monkey patch of testinfra sh -> bash
+# Currently out of commission post-python3 upgrade due to failed monkey patch of testinfra sh -> bash
 #[testenv]
 #whitelist_externals = docker
 #deps = -rrequirements.txt