e1dc289d7d
Fix suggested spelling mistakes
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-22 17:41:29 +01:00
59b3ae999f
Add codespell
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-22 17:37:57 +01:00
93e7daddc1
Merge pull request #1006 from PeterDaveHelloKitchen/Improve-Dockerfile_build
...
Improve/Refactor Dockerfile_build
2022-04-20 20:49:13 +01:00
2afb0fc703
Merge pull request #1071 from vterron/patch-1
...
Fix typo
2022-04-18 15:42:46 +01:00
a88124acdd
Fix typo
...
Signed-off-by: Víctor Terrón <quintanar@gmail.com>
2022-04-18 15:46:27 +02:00
f6d6a31743
Merge pull request #1060 from pi-hole/master
...
sync: master to dev
2022-04-12 17:29:34 +01:00
f3260fb0f9
Update README.md
2022-04-12 17:28:10 +01:00
4b9e142d54
Update README.md
2022-04-12 17:26:55 +01:00
fedf69beeb
Merge pull request #1067 from pi-hole/dev-image-tools
...
If building `dev` or `nightly`, add some additional tools via apt
2022-04-11 22:37:57 +01:00
12ded16443
Merge pull request #1066 from pi-hole/tweak-s6-service-wrapper
...
read pids into an array in case of multiple instances of FTL running.…
2022-04-11 22:31:46 +01:00
edd67d73c5
Merge pull request #1065 from pi-hole/dependabot/github_actions/actions/stale-5
...
Bump actions/stale from 4 to 5
2022-04-11 21:25:24 +01:00
d52eaaa622
If building `dev` or `nightly`, add some additional tools via apt to aid debugging
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-11 21:09:02 +01:00
b0878f1750
read pids into an array in case of multiple instances of FTL running. Wait til they are all closed (stop calls killall) and then start another one
...
Additionally, move the logic from start() into the end of restart(), and have start() call restart, ensures multiple calls of start cannot start multple processes
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-11 20:59:07 +01:00
bcbbdb7a58
Bump actions/stale from 4 to 5
...
Bumps [actions/stale](https://github.com/actions/stale ) from 4 to 5.
- [Release notes](https://github.com/actions/stale/releases )
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/stale/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: actions/stale
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-04-11 06:10:36 +00:00
509ca4b39a
Merge pull request #1064 from jasper-vandemalle/patch-2
...
Fix minor typos in README
2022-04-08 12:02:25 +01:00
95f0eeea00
Fix minor typos in README
2022-04-08 11:37:11 +02:00
a4cb3cf0ca
Merge pull request #1059 from pi-hole/tweak-upgrade-notes
...
Add some notes to the readme regarding buster hosts. Additionally add a note about using watchtower to auto-update
2022-04-07 07:18:16 +01:00
1723f8d5ca
Merge branch 'master' into tweak-upgrade-notes
2022-04-05 09:28:38 +01:00
10c960dd92
Merge pull request #1013 from pi-hole/dependabot/github_actions/actions/checkout-3
...
Bump actions/checkout from 2 to 3
2022-04-04 22:07:52 +01:00
4fa8bbe04c
Bump actions/checkout from 2 to 3
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-04-04 20:46:18 +00:00
1630116ecb
Merge pull request #1058 from pi-hole/touch-install
...
Replace one more instance of `touch` with `install /dev/null`
2022-04-04 21:45:19 +01:00
c1ea9dac8c
Update README.md
2022-04-04 21:01:09 +01:00
709210291d
Merge pull request #1057 from pi-hole/quiet-ftl-outpt
...
Silence FTL output on container run (for now) (again!)
2022-04-04 20:59:23 +01:00
51cffa7e56
Update bash_functions.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
2022-04-04 20:59:07 +01:00
f6947f1497
Add some additonal upgrade notes to the readme, and a note on using watchtower
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-04 18:58:32 +01:00
18e2e11541
Silence FTL output on container run (for now) (again!)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-04 18:07:08 +01:00
0db0df5231
change one more `touch` command to `install /dev/null` to prevent issues on fresh volumes (and for consistency with other usages)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-04 18:06:25 +01:00
a84ede1a5f
Merge pull request #1056 from pi-hole/master
...
sync: master to dev
2022-04-04 16:41:59 +01:00
5bae002db3
Update README.md
2022-04-04 15:15:46 +01:00
cc079aa198
Merge pull request #1050 from pi-hole/dev
...
Dev
2022-04-02 12:32:11 -07:00
60241e3f9a
Merge pull request #1051 from pi-hole/fix/capsh_call
...
Allow caps detection out of order.
2022-04-02 12:25:14 -07:00
ce75910d28
Allow caps detection out of order.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-04-02 12:24:02 -07:00
b76ffa4e67
Merge pull request #1049 from pi-hole/fix/capsh_call
...
Apply detected capabilities and disable DHCP if not capable.
2022-04-02 12:10:04 -07:00
6b9abc23a0
Apply capabilities to pihole-FTL and notify DHCP wihtout NET_ADMIN.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-04-02 11:58:42 -07:00
279b206cdd
Merge pull request #1044 from ozeliurs-MaximeBilly/patch-1
...
your error
2022-04-02 13:26:19 +01:00
321b89e1a6
your error
...
Small error :)
2022-04-02 14:25:20 +02:00
e510bb7588
Update readme to remove note about 2022.04, and instead include new details about upcoming 2022.04.01
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-02 11:58:12 +01:00
70bad9f08f
Extend conditional cap setting to all caps before attempting to set them
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-02 11:08:20 +01:00
5df71380b7
Merge pull request #1041 from pi-hole/only-set-caps-if-we-can
...
Only set capabilities on pihole-FTL binary if they are available to the container
2022-04-02 10:55:32 +01:00
4dc9504330
evert pihole-FTL service command to use s6-setuidgid command when running pihole-FTL
...
Update fix_capabilities to only apply net_admin and sys_nice if they are actually available to the container
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-02 10:50:55 +01:00
658658ebc9
Merge pull request #1038 from pi-hole/master
...
sync: master to dev
2022-04-02 09:46:27 +01:00
91432ada4d
Move upgrade notes to the very top of the README
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-02 09:38:24 +01:00
f1a4bb8584
Include note about capabilities on 2022.04
2022-04-02 09:27:33 +01:00
af0af5a59a
Supress FTL log output (for now)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-01 23:31:00 +01:00
7a1546c001
Merge pull request #1032 from SuperSandro2000/patch-1
...
Document FTL_CMD environment variable
2022-04-01 23:19:22 +01:00
2ec62a3e9b
Merge pull request #1034 from pi-hole/fix/touch_guard
...
Remove touch from runtime init scripts
2022-04-01 23:17:50 +01:00
54f56a717e
Remove touch from runtime init scripts
...
co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-04-01 11:45:16 -07:00
5d8fd599bf
Merge pull request #1033 from pi-hole/fix/touch_guard
...
Add touch guards for Buster hosts and Bullseye images.
2022-04-01 18:19:51 +01:00
ecb0a8c87b
Merge branch 'touch_only_if_needed' into fix/touch_guard
2022-03-31 12:46:34 -07:00
72b1c8679c
Add if/then guards to touch calls for Buster.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-03-31 11:49:35 -07:00
Adam Warner
Víctor Terrón
dependabot[bot]
Jasper Vandemalle
Dan Schaper
BoLLYde Maxime