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
62ca934d07
Merge pull request #1169 from pi-hole/dev
...
Dev -> Master
2022-08-21 20:31:57 +01: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
6edd1fd494
Move the functionality of fix_capabilties into the pihole_FTL run script. Prevents issues when checking out a new branch of pihole-FTL inside the container
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 16:29:44 +01:00
84a497038d
Source webpage.sh anyway - in the end I don't think we will be able to get away from this without a dedicated function in the core repo (or copying the code - but I wont do that)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 15:48:12 +01:00
49062e17f1
Bump to S6 overlay v3 - and the changes that go with that...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-12 15:18:33 +01:00
7863fe5016
spell-check
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-11 23:59:12 +01:00
611df9b3f0
Huge tidy up/prune/refactor of the code
...
- Moves most code in start.sh into functions in bash_functions.sh
- Removes code from 20-start.sh and moves it inside start.sh
- Removes unused variables and code, making it easier to find our way around
- Removes dependency on webpage.sh, which had to be modified in order to source it properly (thus breaking pihole checkout), use utils.sh instead
- Replaces all uses of ServerIP/v6 with new FTLCONF_REPLY_ADDR4/6 variables
- No need to symlink echo to whiptail any more (probably hasn't been needed for a while)
- removes huge list of exported env vars at the top of start.sh - no longer appear to be needed
- rename some functions in bash_functions to more logical names, group their usages in start.sh
- adjust/fix tests to match changes
- remove some dead tests
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-11 23:50:05 +01:00
7e817b9360
Merge pull request #1140 from pi-hole/etc-pihole-files
...
Ensure creation of all needed Pi-hole files in /etc/pihole on container startup
2022-07-11 12:50:20 +01:00
2ebefaab12
Instead of downloading macvendor.db only when it does not exist, move the initially installed version to root and symlink to it to ensure it is always up to date.
...
Run installLogRotate from basic-install.sh to include the logrotate config in /etc/pihole (base image now includes logrotate)
2022-07-11 12:46:07 +01:00
970bc62836
Merge pull request #1138 from pi-hole/macvendor-mounted-volume
...
download macvendor.db on container start if it is missing
2022-07-10 17:11:09 +01:00
e13586aa1e
download macvendor.db on container start if it is missing from /etc/pihole (can happen in the case of a volume mount)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-10 16:54:22 +01:00
64c31b8374
Merge pull request #1136 from pi-hole/master
...
sync: master to dev
2022-07-10 14:32:59 +01:00
7e69551be1
Merge pull request #1135 from pi-hole/dev
...
Dev
2022-07-10 14:00:27 +01:00
8a294e875f
Merge pull request #1130 from yubiuser/skip_install
...
Rename PH_TEST to SKIP_INSTALL
2022-07-10 13:53:32 +01:00
faf8e29751
Merge pull request #1133 from casperklein/dev
...
Silent capsh error output
2022-07-09 17:45:56 +01:00
39021c66f9
Merge branch 'dev' into dev
2022-07-09 17:39:25 +01:00
Adam Warner
TJ Zimmerman
Robin Candau