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
haxwithaxe
fb112ce1bf
Handles docker service names with and without ports.
...
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-14 18:20:19 -04:00
haxwithaxe
06569a5bcd
Handles docker service names with ports.
...
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-14 18:02:41 -04:00
haxwithaxe
1c24b96048
Fixed references to IP(s) to entry/entries in PIHOLE_DNS_ parsing block of start.sh.
...
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-13 22:46:21 -04:00
haxwithaxe
e4a1abb5fb
Added docker service name info to PIHOLE_DNS_ section.
...
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-13 22:40:56 -04:00
haxwithaxe
ae5a5afdc5
Added support for docker links (domain names) as DNS servers.
...
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-13 22:40:56 -04:00
Peter Dave Hello
0897c1e418
Prevent leaving pip cache in Dockerfile_build
...
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2022-02-20 23:07:19 +08:00
Peter Dave Hello
c8179fa62c
Clean up apt cache in Dockerfile_build
...
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2022-02-20 23:07:17 +08:00
Adam Warner
e6cde29cc1
Merge pull request #1005 from PeterDaveHelloKitchen/fix-README.md
...
Fix typo in README.md "Optional Variables" (IPv6)
2022-02-19 15:54:03 +00:00
Peter Dave Hello
e459169d8a
Fix typo in README.md "Optional Variables" (IPv6)
2022-02-16 17:13:39 +08:00
Adam Warner
1b35e7fdd4
Merge pull request #1003 from pi-hole/revert-to-buster
...
Revert base image to buster, we can try bullseye again later, there are a couple of teething issues
2022-02-12 22:56:27 +00:00
Adam Warner
90f4ebe882
revert base image to buster, we can try bullseye again later
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-02-12 22:48:58 +00:00
Adam Warner
6b5f746a15
Merge pull request #999 from pi-hole/master
...
sync: master to dev
2022-02-12 12:30:12 +00:00
Adam Warner
2a705ecfe9
Add investigating label to ignore list
2022-02-12 11:18:34 +00:00
Adam Warner
5b41b63fa0
Merge pull request #997 from rdwebdesign/alert_branch
...
Adding text message asking to select "dev" branch on new PR
2022-02-08 15:15:08 +00:00
Adam Warner
0a7427371e
Merge pull request #996 from rdwebdesign/add_TZ_env
...
Adding `TZ` var to PHP environment
2022-02-08 15:14:03 +00:00
RD WebDesign
5efcd88b20
Text message asking to select "dev" branch on new PR
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-02-07 16:47:59 -03:00
RD WebDesign
fd0b9bf9d3
Adding `TZ` var to PHP environment
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-02-06 17:38:15 -03:00
Adam Warner
a42f67f5ee
Merge pull request #994 from sebastiansterk/patch-1
...
make prerequisites more precise
2022-02-04 21:29:47 +00:00