Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-20 02:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,246 Commits 10 Branches 141 Tags
d3ab97d7b14bb2c2fc540c5ba21fc76367445dbe
Commit Graph

34 Commits

Author SHA1 Message Date
yubiuser
d3ab97d7b1 Remove $PYTEST 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-09-30 20:23:43 +02:00
yubiuser
8ba706e22b WEBPASSWORD_FILE is mounted to /run/secrets 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-25 08:33:30 +01:00
Adam Warner
9a2e3c6ebe Reintroduce ability to set web password from using docker secrets. 
Works exactly as it did in v5

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-02-23 21:30:53 +00:00
Adam Warner
fb53198670 Revert "Reintroduce missed docker secret handling" 2025-02-23 20:57:37 +00:00
Adam Warner
9d55d91132 Reintroduce ability to set web password from using docker secrets. 
Works exactly as it did in v5

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-02-23 18:50:38 +00: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
5b62938371 quiet, codespell 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
Julian Nodorp
61c9a29ea5 Clarify log message for missing caps 
Signed-off-by: Julian Nodorp <6053734+jnodorp@users.noreply.github.com>
 2025-02-08 08:07:10 +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
2922fbdc42 Update src/bash_functions.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2024-07-02 20:02:15 +01:00
Adam Warner
a7565e2b23 Default upstream DNS to Google and remove the mention of the environment variable from the quickstart compose file. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-30 21:22:56 +01:00
DL6ER
63f36bfdd5 Add CAP_SYS_TIME in the container if available 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-08 11:04:52 +02:00
shamoon
1b6469ba74 Fix: correct dns upstreams variable name 
Signed-off-by: shamoon <4887959+shamoon@users.noreply.github.com>
 2024-03-28 11:40:01 -07:00
Adam Warner
24006c7a00 Address comments. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-03-11 18:14:26 +00: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
7f89be5b1d install the logrotate file into /etc/pihole at startup in case of volume mounting 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-11-06 21:43:42 +00:00
Christian König
06819bdd51 Install logrotate 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-31 21:16:05 +01:00
Christian König
c9e23f5a92 /etc/pihole is already created within the Dockerfile 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-10-30 23:34:48 +01:00
Adam Warner
335ec7e40d explicitly test for pwhash containing a value beginning $BALOON-SHA256 2023-10-28 19:47:59 +01: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
0489e57d10 Add special handling for FTL Config names that have underscores in them 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-10-16 17:11:11 +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
c89d5d1286 Minor formatting tweaks 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-09 17:02:38 +01:00
Adam Warner
1a09d39444 chown the macvendor that we copied to root 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-29 17:25:08 +01:00
RD WebDesign
7c48cd548f Fix typo wi1th to with 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2023-06-18 19:10:46 -03:00
Adam Warner
d7a25836ad checkpoint 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-02-15 23:48:53 +00:00