Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-27 21:52:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,269 Commits 10 Branches 141 Tags
a112f2ad406e29bfaeed68401d0cc27c5b39fe62
Commit Graph

49 Commits

Author SHA1 Message Date
yubiuser
a112f2ad40 Use pihole logrotate in cron job 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-10-21 20:31:53 +02:00
yubiuser
e080b72342 Remove slipped in quotes 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-09-30 21:09:18 +02:00
yubiuser
d3ab97d7b1 Remove $PYTEST 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-09-30 20:23:43 +02:00
yubiuser
53baec4b81 Improve wording 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-09-27 12:33:43 +02:00
yubiuser
f21d6e0a69 Exit if FTL did not start 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-09-27 11:45:51 +02:00
yubiuser
647f6c94ea Use FTL's build-in wait-for command for checking the logs 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-09-27 10:39:52 +02:00
Adam Warner
bb9ce87e95 2 spaces -> 4 spaces in start.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-08-13 17:13:48 +01:00
yubiuser
0324370be5 Fix file sytle 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-08-11 22:43:48 +02:00
Adam Warner
0c1fdcf418 Utilise the FTL post-stop script that we install during container build. 
This ensures that all leftover files are cleaned up in line with a bare metal install
 2025-08-03 15:09:48 +01:00
LizenzFass78851
0d241ef7a8 Add a test to check if running a old version of docker 
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
 2025-03-24 19:58:59 +01:00
yubiuser
4fa81da1c9 Remove v5 migration leftover 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-25 13:18:33 +01:00
Adam Warner
b6f909f5a4 Merge pull request #1683 from pi-hole/explicit-migrate 
Utilise FTL's native config upgrade functionality
 2025-02-18 15:23:59 +00:00
yubiuser
dafc95917e Remove unused DHCP_ACTIVE and fix shellcheck warnings 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-10 19:54:06 +01:00
Adam Warner
2be014f066 Remove some redundant commented out code 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-02-10 17:12:53 +01:00
Adam Warner
b6b2a46826 Further tweaks to output - offset gravity schema upgrade messages to fit with the container output. Supress message in FTL migration output about environment variables, as these are not read in until FTLs first proper start 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-02-10 17:12:53 +01:00
Adam Warner
79111aea02 Now that FTL has a native config migration option - we no longer need to defer the startup of FTL as we were previously doing. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-02-10 17:12:53 +01:00
Adam Warner
add6973a28 Monitor the capsh pid, not FTL pid. If stop is called without an exit code being passed to it, then FTL is still running - so we stop FTL and then get the exit code from the capsh PID by immediately waiting it after killing FTL 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-10-09 21:56:57 +01:00
Adam Warner
f9b6999da1 Update src/start.sh 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2024-10-07 23:10:23 +01:00
Adam Warner
9e37aa8f59 Clean up the code - at the end of the start() function, wait for the start_ftl process and pass it's exit code to stop. 
Add in additional while/wait to ensure that after the FTL log exists, it contains the "FTL Started" line

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-10-07 21:54:55 +01:00
Adam Warner
210a1172ff Always terminate the container if pihole-FTL binary exits. Either naturally or via an error. Don't attempt to restart it, allow the container's restart policy to do this. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-10-06 22:49:19 +01:00
Adam Warner
df97235946 Migrate the dnsmasq.d configs that are owned by Pi-hole into /etc/pihole/migration_backup_v6, where FTL expects to find them 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-05 19:30:01 +01:00
Adam Warner
5a9e67025b * Clean up some of the output for the container startup 
* Only start tailing pihole-FTL log from most recent pihole-FTL start
* If v5 config files are detected, but no v6 files are, then we must defer some of the configuration until after FTL has migrated the files
* move some of the logic from start into bash_functions to make it easier to follow the start

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-08-25 22:29:20 +01:00
Adam Warner
9fefa11c41 Tidy up a few things in the readme and code. 
Check that pihole-FTL is configured with upstream servers or it will not function!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-03-10 19:29:38 +00:00
Adam Warner
23fe63dff6 Get rid of the SKIPGRAVITYONBOOT environment variable. Instead, only run gravity on a fresh volume if the gravity database does not exist. There isn't really any need for gravity to be updated on every start (current default behaviour) 
This will still run the gravity migration scripts on every boot if the gravity database exists

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-11-03 14:22:43 +00:00
Adam Warner
74657d01a9 - Bring back the logic from v5 containers for web password 
- Update readme to take into accounts changes to FTLs environment variable handling
- shell/md linting, tidy away some code that is no longer needed

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-22 17:42:27 +01:00
Adam Warner
0784964f60 This is all now handled natively in FTL, no need for the bash 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-20 11:39:28 +01:00
Adam Warner
92ab9ad4ac Merge pull request #1423 from pi-hole/v6/additional_packages 
Allow end user to add additional packages to the image
 2023-09-25 22:36:36 +01:00
Adam Warner
bf12b02636 Update src/start.sh 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2023-09-25 20:00:22 +01:00
Adam Warner
672797b229 Remove the "INSTALL_DEV_TOOLS" environment variable in favour of "ADDITIONAL_PACKAGES", to allow user to add any package they wish to the container. Will be mentioned in README with a HERE BE DRAGONS warning. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-09-21 00:01:37 +01:00
Adam Warner
0704f06cd8 Update src/start.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2023-09-10 20:42:10 +01:00
Adam Warner
76e09bf15a Give users an option to silence the FTL log output by passing in the environment variable TAIL_FTL_LOG with a value of 0. Defaults to enabled (1) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-09-03 13:02:50 +01:00
Adam Warner
374f6f2537 Add in a test to kill start.sh and then ensure that pihole-FTL is gracefully exited. 
We add in some sleeps to ensure that the log file is being written to before we check it
Log entry tests are based on many different passes of running this locally with all sorts of timeouts and sleeps, this seems to be the most consistent

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 23:31:39 +01:00
Adam Warner
696895fa59 Fix some broken logic in the gravity skip code (I should have read it better) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 22:15:41 +01:00
Adam Warner
94795db7e9 correct tini path 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 21:38:49 +01:00
Adam Warner
b674a8bde7 Who needs an init system anyway? Add a trap to ensure that pihole-FTL shuts down cleanly on container exit. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-08-09 21:20:11 +01:00
Adam Warner
0748c7fc62 Update src/start.sh 
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2023-08-09 19:46:48 +01:00
edgd1er
7cf55cb722 if skipgravityonboot set, check db version 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2023-07-27 03:24:55 +02:00
edgd1er
a2770a3f18 uid/gid: add info when already as expected 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2023-07-26 22:50:10 +02:00
edgd1er
2a8fa77adc extracted functions need to be rewritten to remove the return 
Signed-off-by: edgd1er <edgd1er@hotmail.com>
 2023-07-26 22:11:51 +02:00
Adam Warner
62dd8d503c Allow the for changing of the UID/GID of the user/group pihole 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-26 08:25:08 +01:00
Adam Warner
348e27b45f Merge pull request #1368 from pi-hole/reimplement-skip-gravity 
Re-implement SKIPGRAVITYONBOOT
 2023-07-17 17:37:23 +01:00
Adam Warner
11b6b8bd34 Remove some dependencies, move nano & less to the start script and only intall if env var INSTALL_DEV_TOOLS > 0 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-11 19:15:52 +01:00
Adam Warner
5d33fdadd3 reimplement allowing user to skip gravity on boot with the environment variable SKIPGRAVITYONBOOT (as with v5) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-11 19:15:37 +01:00
Adam Warner
5435c9d6c1 Start FTL after running gravity completely. Else we end up in a situation where the database getss stuck in readonly 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-09 17:09:32 +01:00
Adam Warner
d415bffcb7 Create our own cron file rather than copying the one from the core repo (which contains non-standard cron syntax) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 22:54:49 +01:00
Adam Warner
a5c8e6d873 Run pihole update checked on container start 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-29 17:24:56 +01:00
Adam Warner
45c636eb25 Use pihole-FTL prestart script from core repo to avoid code duplication. Change the order of startup objects a little. 
look at starting crond on startup

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-21 19:18:12 +01:00
Adam Warner
171c8108f9 Remove the s6 directory to prevent confusion. I will try to remember where I was with the previous commit. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-09 18:53:42 +01:00
Adam Warner
d7a25836ad checkpoint 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-15 23:48:53 +00:00