1284 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Warner	509ca4b39a	Merge pull request #1064 from jasper-vandemalle/patch-2 ... Fix minor typos in README	2022-04-08 12:02:25 +01:00
Jasper Vandemalle	95f0eeea00	Fix minor typos in README	2022-04-08 11:37:11 +02:00
Adam Warner	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
Adam Warner	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
Adam Warner	51cffa7e56	Update bash_functions.sh ... Co-authored-by: yubiuser <ckoenig@posteo.de>	2022-04-04 20:59:07 +01:00
Adam Warner	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
Adam Warner	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
Adam Warner	a84ede1a5f	Merge pull request #1056 from pi-hole/master ... sync: master to dev	2022-04-04 16:41:59 +01:00
Adam Warner	5bae002db3	Update README.md	2022-04-04 15:15:46 +01:00
Dan Schaper	cc079aa198	Merge pull request #1050 from pi-hole/dev ... Dev	2022-04-02 12:32:11 -07:00
Dan Schaper	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
Dan Schaper	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
Dan Schaper	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
Dan Schaper	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
Adam Warner	279b206cdd	Merge pull request #1044 from ozeliurs-MaximeBilly/patch-1 ... your error	2022-04-02 13:26:19 +01:00
BoLLYde Maxime	321b89e1a6	your error ... Small error :)	2022-04-02 14:25:20 +02:00
Adam Warner	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
Adam Warner	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
Adam Warner	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
Adam Warner	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
Adam Warner	658658ebc9	Merge pull request #1038 from pi-hole/master ... sync: master to dev	2022-04-02 09:46:27 +01:00
Adam Warner	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
Adam Warner	f1a4bb8584	Include note about capabilities on 2022.04	2022-04-02 09:27:33 +01:00
Adam Warner	af0af5a59a	Supress FTL log output (for now) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-04-01 23:31:00 +01:00
Adam Warner	7a1546c001	Merge pull request #1032 from SuperSandro2000/patch-1 ... Document FTL_CMD environment variable	2022-04-01 23:19:22 +01:00
Adam Warner	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
Dan Schaper	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
Adam Warner	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
Dan Schaper	ecb0a8c87b	Merge branch 'touch_only_if_needed' into fix/touch_guard	2022-03-31 12:46:34 -07:00
Dan Schaper	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
RD WebDesign	3cb043eb10	Use touch only if we need to create an absent file ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2022-03-31 15:00:47 -03:00
Sandro	c31599c403	Document FTL_CMD env ... Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>	2022-03-29 23:36:47 +02:00
Adam Warner	41c1596915	Merge pull request #1030 from pi-hole/fix/new_docker ... Docker 20.10.14 binary capabilites update.	2022-03-29 18:59:05 +01:00
Dan Schaper	f8cc0878e1	Merge branch 'fix/new_docker' of https://github.com/pi-hole/docker-pi-hole into fix/new_docker	2022-03-28 18:40:07 -07:00
Dan Schaper	a485e238ca	call capsh directly, no need to set uid/gid ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2022-03-28 18:37:03 -07:00
Dan Schaper	ca315e4ee9	Remove 'nice' in the docker environment ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2022-03-28 17:25:43 -07:00
Dan Schaper	cf06b7ead3	Allow caps inheritance for raising to ambient. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2022-03-28 16:48:46 -07:00
Dan Schaper	086dd6cc86	Bullseye based capsh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2022-03-28 14:37:13 -07:00
Adam Warner	946dc195e8	Merge pull request #1029 from pi-hole/bullseye-time ... Upgrade to Bullseye base image instead of buster	2022-03-28 22:36:52 +01:00
Adam Warner	ee20e52d75	use bullseye base image ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2022-03-28 22:15:49 +01:00
Adam Warner	b5e656491e	Merge pull request #1028 from pi-hole/revert-1009-dev_origin ... Revert "Dev origin: enable lighttpd-mod-ssl in lighttpd when based on debian:bullseye"	2022-03-28 22:05:38 +01:00
Adam Warner	099f81b2d2	Revert "Dev origin: enable lighttpd-mod-ssl in lighttpd when based on debian:bullseye"	2022-03-28 22:05:28 +01:00
Adam Warner	99dc2e0952	Merge pull request #1009 from edgd1er/dev_origin ... Dev origin: enable lighttpd-mod-ssl in lighttpd when based on debian:bullseye	2022-03-28 21:12:58 +01:00
Dan Schaper	2bfc7f57de	Merge pull request #1023 from pi-hole/dschaper-patch-1 ... See Mattermost for discussion.	2022-03-24 14:44:36 -07:00
Dan Schaper	1221d91685	Whistles....	2022-03-24 14:40:25 -07:00
Dan Schaper	06232c767e	See Mattermost for discussion. ... Trying again with DAC override.	2022-03-24 14:35:12 -07:00
edgd1er	442d181925	Enable lighttpd-mod-ssl on bullseye ... Signed-off-by: edgd1er <edgd1er@hotmail.com>	2022-03-24 21:42:46 +01:00
Adam Warner	109879ae6c	Merge pull request #1022 from pi-hole/dschaper-patch-1 ... Test fix for moby security update.	2022-03-24 19:51:47 +00:00
Dan Schaper	3aee0e1eaf	Test fix for moby security update. ... Change the permissions to `permitted` instead of `inherited`. See https://github.com/moby/moby/issues/43420#issuecomment-1077870013	2022-03-24 12:48:24 -07:00
Adam Warner	d46a1e3356	Merge pull request #1014 from haxwithaxe/support-docker-links-for-PIHOLE_DNS_dev ... Support docker service names and links for PIHOLE_DNS_	2022-03-16 15:30:43 +00:00