1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-27 19:55:14 +02:00
Commit Graph

38 Commits

Author SHA1 Message Date
Matt Winter
1633a976a4 Only remove the cron.d file if it exists
Signed-off-by: Matt Winter <MattWinter@gmail.com>
2021-04-16 12:36:13 -04:00
Matt Winter
fa771f74fd Change gravity-on-boot so it's run by cron
Proposed solution to #834

I believe the correct way to solve this issue is to change when "Gravity on Boot" is run.

The s6 init system has different stages. Currently, "gravity on boot" is run during Stage 2.ii: cont-init.d. One instance of pihole-FTL is started during cont-init, but it is only there to check the validity of the config files; it exits soon after starting. The final "service mode" instance of pihole-FTL is not started until Stage 2.iii, when the supervisor starts doing work.

If gravity.sh is counting on FTL to do its DNS lookups, then we should not run gravity until the supervised instance of FTL is running. We can accomplish this by moving "Gravity on Boot" to a @reboot line in /etc/cron.d/gravity-on-boot, and making that file's existence dependent on the value of SKIPGRAVITYONBOOT.

This will work because cron isn't started until we've reached Stage 2.iii.

Signed-off-by: Matt Winter <MattWinter@gmail.com>
2021-04-16 10:58:14 -04:00
Adam Warner
abdf9f1130
remove shared memory files before starting the FTL process. Mimics bare metal service script (to an extent) (#796)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-16 23:09:49 +00:00
Athrogate
8770b9789b Update 20-start.sh
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2020-08-22 18:17:17 -04:00
Athrogate
7248b3c915 Update 20-start.sh
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2020-08-22 18:17:17 -04:00
Athrogate
e15017d69a Update 20-start.sh
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2020-08-22 18:17:17 -04:00
Adam Hill
4c4e9c3bc9 Beta v5.0
Signed-off-by: Adam Hill <adam@diginc.us>
2020-02-03 23:39:03 -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
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
2336174036
comment tweak
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-01 14:21:53 -06:00
Adam Hill
d9ca4187b9
new pihole dev 2019-01-01 13:51:33 -06:00
Adam Hill
d7a125a706
Version 4.1
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-12 20:43:08 -06:00
Adam Hill
187c1d3f29
stop using pihole init.d stop, may be going away
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 10:30:51 -05:00
Adam Hill
e7ae12a94c
Add fixes for config permissions, deprection notice 2018-08-02 22:50:01 -05:00
Adam Hill
0e7ab463fa
add finish scripts to restart cleanly
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-19 22:57:05 -05:00
diginc
3877a171da fix startup 53 port conflict and test error 2018-07-04 14:11:18 -05:00
diginc
ad6b4be403 Fixes to the startup, services, and dnsmasq references 2018-07-03 00:19:01 -05:00
diginc
041ef30d42 Merge remote-tracking branch 'origin/dev' into prerelease 2018-07-02 20:50:51 -05:00
diginc
d45bccf9b4 remove dnsmasq service for new pihole-FTL service 2018-07-02 20:50:31 -05:00
StefanSchoof
002c8349d2 remove extra set from debugging 2018-07-02 18:18:01 +00:00
StefanSchoof
4ff219b5b8 Fail container on error in start.sh 2018-07-02 11:45:39 +00:00
Adam Hill
d57159e9ea
Update run 2018-03-07 10:55:49 -06:00
diginc
1c598d3078 adding FTL_CMD for debug 2018-03-01 22:16:38 -06:00
diginc
9b7e3998d6 Fix ServerIP v4 validation - error can also be about DNS not being up yet 2018-01-26 18:26:46 -06:00
diginc
3bcdd27cb9 fix ipv6 test 2018-01-04 22:30:40 -06:00
diginc
c4dc16685a shrink 20-start.sh, merge to start.sh 2018-01-03 22:34:31 -06:00
diginc
c4986cfeff space 2018-01-03 21:37:44 -06:00
diginc
130f50c769 merge dev 2018-01-03 21:37:19 -06:00
diginc
615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
Thomas LEVEIL
9318064061 fail container if start.sh fails
stop the container whenever start.sh exits with exit status != 0
2017-12-12 01:01:45 +01:00
diginc
d9fa9b1016 alpine 3.2 startup tests fixed, web still failing 2017-12-11 10:28:15 -06:00
diginc
6ff1d21f7b New s6 version, remove old list.sh 2017-12-07 19:57:09 -06:00
diginc
825248fb86 switch alpine nginx hostname to _ 2017-10-16 19:40:59 -05:00
diginc
2a5b6de029 see if this fixes alpine 2017-05-24 08:06:43 -05:00
diginc
0e2b77577d adding a alpine compatible list.sh 2017-05-13 18:43:34 -05:00
diginc
b9095bc123 This commit is too big, but it works
* Tests are passing, hopefully consistently
* FTL pulling from official releases
  * thanks @DL6ER for the musl-libc build
* Thanks middleagedman for the IPv6 fixes
* Thanks everyone for patience while I get this release working!
2017-05-13 17:03:24 -05:00
diginc
8d0ea48ecd 3.0.1 progress 2017-05-09 15:03:03 -05:00
diginc
9f61b87198 debian converted to s6, aline files moved 2017-05-05 21:48:03 -05:00