e6d4c3091f
Move all scripts to /usr/local/bin to simplify dockerfile
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:48:07 +01:00
55f4f89a0c
remove some no-longer-referenced files
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:37:42 +01:00
faffe6430f
Remove the 01-resolver-resolv file - can't track down what it does from looking at commit history - functionality is deprecated
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 11:21:29 +01:00
48c6192617
reintroduce ability to set verbose output
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-29 10:38:04 +01:00
9d0162ebcc
Merge pull request #1185 from pi-hole/tweak/PIHOLE_DNS_ARR
...
Test for empty values in the PIHOLE_DNS_ array, skip if it's empty
2022-08-27 08:16:08 +01:00
939a69b895
Test for empty values in the PIHOLE_DNS_ array, skip if it's empty
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-26 22:46:10 +01:00
1daeb117cb
Merge pull request #1183 from pi-hole/master
...
sync: master to dev
2022-08-26 22:45:52 +01:00
9039a73272
Merge pull request #1182 from pi-hole/dev
...
Dev -> Master
2022-08-26 00:23:17 +01:00
cbd86caa5b
Merge pull request #1170 from pi-hole/dependabot/pip/urllib3-1.26.5
...
Bump urllib3 from 1.25.9 to 1.26.5
2022-08-25 21:50:26 +01:00
471e0425c6
Merge pull request #1181 from pi-hole/fix-podman-issues
...
Fix issues with Podman and S6 overlay
2022-08-25 21:50:09 +01:00
8619de0031
Revert change that removed the moving of /init to /s6-init. Add comments to make sure it does not get removed again
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-25 19:31:21 +01:00
a7c7be01c1
Merge pull request #1180 from pi-hole/master
...
sync: master to dev
2022-08-25 16:13:51 +01:00
4241e50d4f
Merge pull request #1179 from pi-hole/dev
...
Dev -> Master
2022-08-25 13:41:39 +01:00
6baa4f9f08
Merge pull request #1178 from pi-hole/master
...
sync: master to dev
2022-08-25 13:40:09 +01:00
c89a55c72e
Update dependabot.yml
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-24 21:41:56 +01:00
776bac7b90
[Experimental] Move the capability setting back to bash_functions from the pihole-FTL service
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-24 21:27:38 +01:00
7ac0e8f0e3
Merge pull request #1173 from pi-hole/update-docs
...
FTLCONF_REPLY_ADDR4/6 are now deprecated. Use FTLCONF_LOCAL_IPV4/6 instead
2022-08-23 19:02:28 +01:00
a1f9601c89
Merge branch 'dev' into update-docs
2022-08-22 21:46:12 +01:00
cb38190b50
FTLCONF_REPLY_ADDR4/6 are now deprecated. Use FTLCONF_LOCAL_IPV4/6 instead
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22 21:42:29 +01:00
8273649b5e
Merge pull request #1172 from pi-hole/master
...
sync: master to dev
2022-08-22 17:25:26 +01:00
72634fcbc2
Merge branch 'dev' into master
2022-08-22 17:22:32 +01:00
f2a84ce3dc
Remove the stuff that only runs workflows when certain files are changed - it's not working as nice as it could
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22 17:20:00 +01:00
66aeeb8542
Merge pull request #1154 from pi-hole/master
...
sync: master to dev
2022-08-21 20:43:43 +01:00
f2d42a5b40
No need for this shim
2022-08-21 20:42:42 +01:00
33966f8eb2
Bump urllib3 from 1.25.9 to 1.26.5
...
Bumps [urllib3](https://github.com/urllib3/urllib3 ) from 1.25.9 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases )
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst )
- [Commits](https://github.com/urllib3/urllib3/compare/1.25.9...1.26.5 )
---
updated-dependencies:
- dependency-name: urllib3
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-08-21 19:32:22 +00:00
62ca934d07
Merge pull request #1169 from pi-hole/dev
...
Dev -> Master
2022-08-21 20:31:57 +01:00
31cd4fbc47
Add systemd-resolved note for Fedora
...
Fedora 33+ enables [systemd-resolved by default](https://fedoraproject.org/wiki/Changes/systemd-resolved ), so the "Installing on Ubuntu" section becomes relevant for Fedora users as well.
This small change makes it possible to search the Readme for "Fedora" and find the solution instantly.
Signed-off-by: Frédérick Morin <freddydumont@users.noreply.github.com>
2022-08-15 16:46:25 -04:00
cbe61e0b44
Use dorny/paths-filter instead of the built-in path exclude. This allows us to skip "required" jobs set in branch protection rules
2022-08-01 18:37:17 +01:00
b7a1e924ed
Merge pull request #1161 from zimmertr/fix_readme_syntax
...
Add missing backticks to Experimental Variables section on README for consistent markdown
2022-08-01 10:19:28 +01:00
40224be544
Add missing backticks to Exp. Vars for formatting.
2022-08-01 00:10:51 -07:00
4acba89c3e
Merge pull request #1158 from pi-hole/dontbuildreadme
...
Don't run full test and build when only the README file is changed
2022-08-01 08:08:45 +01:00
0f3f8fb571
Don't run full test and build for changes to the README file (in theory!)
2022-08-01 08:00:55 +01:00
4f5330f8f0
Temporary commit to (potentially!) fix failing nightly builds
2022-07-24 00:09:23 +01:00
08837c5dcb
Merge pull request #1152 from pi-hole/oneshot-timeouts
...
Run `_gravityonboot` oneshot in background
2022-07-21 19:52:04 +01:00
6830b99e4a
Start gravityonboot.sh as a background task to prevent timeouts
2022-07-21 19:46:02 +01:00
b9df80b1ee
Change of naming convention for oneshots
2022-07-21 19:45:30 +01:00
1970ffd97d
Merge pull request #1148 from pi-hole/fix/webpassword-env
...
Fix environment variable regression caused by refactor
2022-07-21 17:27:37 +01:00
4fe91be9c9
Merge pull request #1151 from Antiz96/dev
...
Update docker_run.sh
2022-07-21 13:18:14 +01:00
fc99c98f30
Update docker_run.sh
...
Signed-off-by: Robin Candau <53110319+Antiz96@users.noreply.github.com>
2022-07-21 13:58:23 +02:00
e75e3800a2
make sure that setup_FTL_ProcessDNSSettings is the last thing called, else user set environment variables will be overridden when it sources setupVars.conf
...
Some additional tweaks
2022-07-19 18:22:49 +01:00
970c45c950
Merge pull request #1147 from pi-hole/massive-refactor
...
Reorganise Repository to make things easier to follow
2022-07-15 18:07:23 +01:00
e7e9004ac2
Merge branch 'dev' into massive-refactor
2022-07-15 18:04:14 +01:00
2c963a0f01
update example paths in readme
2022-07-15 17:46:33 +01:00
1d59f257ff
Reorganise the repository
...
Simplify the test suite now that we use buildx to build the final image
Remove tests that were never run/skipped in previous runs (same number of tests passing as were before)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-15 17:43:09 +01:00
318720fab9
Merge pull request #1141 from pi-hole/massive-refactor
...
Huge tidy up/prune/refactor of the code
2022-07-15 17:13:01 +01:00
74dec72bbb
Update s6/debian-root/etc/s6-overlay/s6-rc.d/1-startup/up
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-07-15 16:28:16 +01:00
eb5c86ed3e
Try i686 version of s6 overlay for i386 container?
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-14 18:37:00 +01:00
d6dde5a1fd
shellcheck
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 16:44:11 +01:00
13c45454dd
finish service script wrapper
...
Build this branch on push?
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 16:40:04 +01:00
c82c33b5a3
Merge pull request #1142 from pi-hole/s6-3-markII
...
Upgrade to S6 overlay v3
2022-07-12 16:31:06 +01:00
Adam Warner
dependabot[bot]
Frédérick Morin
TJ Zimmerman
Robin Candau