1433 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Warner	9039a73272	Merge pull request #1182 from pi-hole/dev ... Dev -> Master	2022-08-26 00:23:17 +01:00
Adam Warner	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
Adam Warner	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
Adam Warner	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
Adam Warner	a7c7be01c1	Merge pull request #1180 from pi-hole/master ... sync: master to dev	2022-08-25 16:13:51 +01:00
Adam Warner	4241e50d4f	Merge pull request #1179 from pi-hole/dev ... Dev -> Master	2022-08-25 13:41:39 +01:00
Adam Warner	6baa4f9f08	Merge pull request #1178 from pi-hole/master ... sync: master to dev	2022-08-25 13:40:09 +01:00
Adam Warner	c89a55c72e	Update dependabot.yml ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-08-24 21:41:56 +01:00
Adam Warner	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
Adam Warner	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
Adam Warner	a1f9601c89	Merge branch 'dev' into update-docs	2022-08-22 21:46:12 +01:00
Adam Warner	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
Adam Warner	8273649b5e	Merge pull request #1172 from pi-hole/master ... sync: master to dev	2022-08-22 17:25:26 +01:00
Adam Warner	72634fcbc2	Merge branch 'dev' into master	2022-08-22 17:22:32 +01:00
Adam Warner	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
Adam Warner	66aeeb8542	Merge pull request #1154 from pi-hole/master ... sync: master to dev	2022-08-21 20:43:43 +01:00
Adam Warner	f2d42a5b40	No need for this shim	2022-08-21 20:42:42 +01:00
dependabot[bot]	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
Adam Warner	62ca934d07	Merge pull request #1169 from pi-hole/dev ... Dev -> Master	2022-08-21 20:31:57 +01:00
Adam Warner	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
Adam Warner	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
TJ Zimmerman	40224be544	Add missing backticks to Exp. Vars for formatting.	2022-08-01 00:10:51 -07:00
Adam Warner	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
Adam Warner	0f3f8fb571	Don't run full test and build for changes to the README file (in theory!)	2022-08-01 08:00:55 +01:00
Adam Warner	4f5330f8f0	Temporary commit to (potentially!) fix failing nightly builds	2022-07-24 00:09:23 +01:00
Adam Warner	08837c5dcb	Merge pull request #1152 from pi-hole/oneshot-timeouts ... Run `_gravityonboot` oneshot in background	2022-07-21 19:52:04 +01:00
Adam Warner	6830b99e4a	Start gravityonboot.sh as a background task to prevent timeouts	2022-07-21 19:46:02 +01:00
Adam Warner	b9df80b1ee	Change of naming convention for oneshots	2022-07-21 19:45:30 +01:00
Adam Warner	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
Adam Warner	4fe91be9c9	Merge pull request #1151 from Antiz96/dev ... Update docker_run.sh	2022-07-21 13:18:14 +01:00
Robin Candau	fc99c98f30	Update docker_run.sh ... Signed-off-by: Robin Candau <53110319+Antiz96@users.noreply.github.com>	2022-07-21 13:58:23 +02:00
Adam Warner	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
Adam Warner	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
Adam Warner	e7e9004ac2	Merge branch 'dev' into massive-refactor	2022-07-15 18:04:14 +01:00
Adam Warner	2c963a0f01	update example paths in readme	2022-07-15 17:46:33 +01:00
Adam Warner	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
Adam Warner	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
Adam Warner	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
Adam Warner	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
Adam Warner	d6dde5a1fd	shellcheck ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-07-12 16:44:11 +01:00
Adam Warner	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
Adam Warner	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	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
Adam Warner	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
Adam Warner	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
Adam Warner	7863fe5016	spell-check ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-07-11 23:59:12 +01:00
Adam Warner	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
Adam Warner	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
Adam Warner	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
Adam Warner	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