From e1dc289d7d865974f34fd0987371ee6c3210b9a6 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Fri, 22 Apr 2022 17:41:29 +0100 Subject: [PATCH] Fix suggested spelling mistakes Signed-off-by: Adam Warner --- README.md | 4 ++-- bash_functions.sh | 4 ++-- start.sh | 2 +- test/conftest.py | 6 +++--- tox.ini | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1fc8019..871122b 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,14 @@ - **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_ + _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. 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 diff --git a/bash_functions.sh b/bash_functions.sh index 8fc6409..79469ae 100644 --- a/bash_functions.sh +++ b/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 diff --git a/start.sh b/start.sh index d0b44c1..90ef9c3 100755 --- a/start.sh +++ b/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 diff --git a/test/conftest.py b/test/conftest.py index f76e9cf..744323d 100644 --- a/test/conftest.py +++ b/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') diff --git a/tox.ini b/tox.ini index 9342d6b..8d226c3 100644 --- a/tox.ini +++ b/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