903 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Hill	02e3ead7eb	Docker Pi-hole v4.3 ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-04-11 22:17:26 -05:00
Adam Hill	95a665c057	Update README.md	2019-02-18 14:11:13 -06:00
Adam Hill	99eadced3a	Merge pull request #426 from pi-hole/v4.2.2 ... Release v4.2.2	2019-02-18 13:22:06 -06:00
Adam Hill	e23e0ef5bf	Release v4.2.2 ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-18 13:14:56 -06:00
Adam Hill	f1f53e7b84	Merge pull request #418 from pi-hole/dev ... Docker fixes / updates for 4.2.1	2019-02-18 13:07:31 -06:00
Adam Hill	5dfa5398b8	Fix #364 ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-17 00:18:34 -06:00
Adam Hill	669d91dfe3	No v6 default or validation of the env breaks for non v6 enabled computers ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-14 23:23:26 -06:00
Adam Hill	e5ad7aea55	A bunch of readme tweaks ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-14 22:06:16 -06:00
Adam Hill	ceda92b0f2	disable this trash test ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-14 21:01:36 -06:00
Adam Hill	0563a3c795	sync ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-14 20:05:53 -06:00
Adam Hill	5f36094b21	does this work any better ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-14 19:55:18 -06:00
Adam Hill	f0e2d705dc	maybe ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-14 00:48:03 -06:00
Adam Hill	ca3fcd6993	show me your secrets	2019-02-14 00:42:05 -06:00
Adam Hill	2040cc5978	back to using 2 dns ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-14 00:23:42 -06:00
Adam Hill	1ccea93c16	revert to old setup ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-14 00:18:55 -06:00
Adam Hill	9c7b02aba9	Slow down after setup to try to fix test ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-13 23:45:17 -06:00
Adam Hill	ca4fe84df2	add some more details to ouput to debut travis failure ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-13 23:26:21 -06:00
Adam Hill	f9a21d2ff9	empty the adlist for tests ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-12 22:16:15 -06:00
Adam Hill	1685ed342f	Another flaky test, logs of readme ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-09 02:08:20 -06:00
Adam Hill	f71ecf0802	Fix default block list install ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-09 00:22:12 -06:00
Adam Hill	236b2f1ed6	Slow down all the flakey tests to pass 100% ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-09 00:09:37 -06:00
Adam Hill	7ecf7c6f28	Fixed tests! ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-08 23:14:48 -06:00
Adam Hill	fca7769b33	remove ServerIP requirement, simpler example commands ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-07 19:51:15 -06:00
Adam Hill	6c3d02f049	Merge pull request #415 from mhofman/master ... Allow running pihole-FTL as non-root	2019-02-06 20:08:26 -06:00
Mathieu Hofman	6629aff889	Allow running pihole-FTL as non-root ... - Add a new container environment variable allowing to specify the user to run the pihole-FTL process as. Defaults to root. - Set inherited capabilities attributes on the pihole-FTL file to automatically grant runtime permitted capabilities when available in the bounding set. This allows dropping root before starting pihole-FTL without failing with a permission error if the capabilities are not available to the container (the process may still error out if performing an operation requiring the capability). - Add some information on capabilities to the Readme file. Signed-off-by: Mathieu Hofman <86499+mhofman@users.noreply.github.com>	2019-02-06 02:31:33 -08:00
Adam Hill	68d6c343a5	hotfix for bad grep ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-05 00:17:59 -06:00
Adam Hill	607092ed32	Merge pull request #413 from pi-hole/v4.2.1 ... v4.2.1 & more robust user root fix	2019-02-03 22:08:59 -06:00
Adam Hill	1e2cdba3a3	change to calling it dnsmasq user ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-03 18:37:03 -06:00
Adam Hill	0b8333f7bc	v4.2.1 & more robust user root fix ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-03 18:30:51 -06:00
Adam Hill	a522eae6e9	Merge pull request #412 from pi-hole/run_dnsmasq_as_root ... run FTL as root	2019-02-03 12:53:45 -06:00
Adam Hill	cf1bb48fa8	run FTL as root ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-03 12:47:41 -06:00
Adam Hill	c3bfdfb5de	Merge pull request #411 from pi-hole/production_4.2 ... switch to production tags	2019-02-03 11:56:41 -06:00
Adam Hill	d6642fc191	broken test (works outside tests), not required for release ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-03 11:45:40 -06:00
Adam Hill	e6e8d0015d	Merge branch 'production_4.2' of github.com:diginc/docker-pi-hole into production_4.2	2019-02-03 11:29:07 -06:00
Adam Hill	18de6b3883	install FTL ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-03 11:27:49 -06:00
Adam Hill	f0b8561990	Merge branch 'master' into production_4.2	2019-02-03 10:56:29 -06:00
Adam Hill	7e2986f51c	switch to production tags ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-03 10:55:35 -06:00
Adam Hill	7aab18e0a4	Merge pull request #402 from pi-hole/release/v4.2 ... v4.2 and Version pulled from a file now	2019-02-03 10:54:56 -06:00
Adam Hill	8ece19132d	deploy support for RCs, fix enable test ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-02-02 12:59:02 -06:00
Adam Hill	d3309ebb1a	remove old blocking page setup/test ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-01-21 22:43:38 -06:00
Adam Hill	38d76d7ec8	fix conftest path to VERSION ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-01-21 20:37:05 -06:00
Adam Hill	08c2ac2e48	consistent global version var ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-01-21 00:09:05 -06:00
Adam Hill	440a7a19a5	v4.2 and Version pulled from a file now ... Signed-off-by: Adam Hill <adam@diginc.us>	2019-01-20 23:59:35 -06:00
Adam Hill	7ec893ae3f	Merge pull request #395 from pi-hole/dev ... Docker-compose update	2019-01-16 22:42:02 -06:00
Adam Hill	d43675afa3	Merge branch 'master' into dev	2019-01-16 21:50:50 -06:00
Adam Hill	7e21322167	Merge pull request #394 from chapb/patch-1 ... Update with 4.1.1+ requirement for cap_add	2019-01-16 20:35:48 -06:00
Brennan Chapman	17c185b40a	Update with 4.1.1+ requirement for cap_add ... Uncommented cap_add as required in 4.1.1+ to start DNS service, not just for DHCP.	2019-01-16 20:51:43 -05:00
Adam Hill	3ba80f1071	Merge pull request #390 from vhp/vincent-extra-sleep ... Extend sleep and add env file for usage	2019-01-13 14:44:55 -06:00
Adam Hill	83cd82906d	Merge branch 'master' into vincent-extra-sleep	2019-01-13 13:49:37 -06:00
Vincent Perricone	403a205b2a	Remove excess bash from Readme ... Signed-off-by: Vincent Perricone <vhp@fastmail.fm>	2019-01-13 14:48:27 -05:00