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,318 Commits 10 Branches 141 Tags
a531598692ce38d30b7d313329b6babbebadae40
Commit Graph

199 Commits

Author SHA1 Message Date
Adam Warner
db12aa285b Be more explicit in the timeout error message 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-11-06 19:39:11 +00:00
Adam Warner
acf2db2d5e Get the size of the FTL log file upon container startup before starting FTL. We will use this as a starting point to: 
- Check that FTL has started when grepping for the "FTL Started" string
 - Position to start tailing from when streaming the log file

We wait for a maximum of 30 seconds for FTL to start, else we exit the container

Co-authored-by: yubiuser <github@yubiuser.dev>
Co-authored-by: casperklein <casperklein@users.noreply.github.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-11-06 17:56:07 +00:00
casperklein
bc65f173aa Remove remaining hard-coded FTL log paths 
Signed-off-by: casperklein <casperklein@users.noreply.github.com>
 2025-10-28 01:21:56 +01:00
yubiuser
2d879730d2 Don't use hard-coded FTL.log path 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-10-26 14:10:42 +01:00
Adam Warner
ffd3cbb944 Revert FTL wait-for changes 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-10-26 13:04:23 +00: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
yubiuser
950a893f84 Add pihole-FTL bash completion 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-08-18 20:00:12 +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
Adam Warner
bd31bc02f0 Merge pull request #1870 from pi-hole/remove/nc 
Remove ncat dependency
 2025-07-21 17:34:01 +01:00
yubiuser
0023474a32 Simplify variable names 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-07-21 14:01:14 +02:00
yubiuser
3b502683b8 Use a function to reduce code duplication 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-07-21 13:56:32 +02:00
yubiuser
92429e3c50 Remove ncat dependency 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-07-16 09:18:56 +02:00
yubiuser
b6ab417692 Only clone depth 1 when checking out tags 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-07-16 08:26:01 +02:00
Adam Warner
d1e0e78f0e Increase the depth of the clone by a little to account for there potentially being additonal commits ahead of the latest tag in both web and core repos. 
This is not always the case, but it prevents the built docker container having a broken version string

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-07-14 22:49:30 +01:00
yubiuser
836225c96c Build all containers from a fixed base image 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-07-01 11:50:57 +02:00
Rob Gill
67e12547f8 Pull in iproute2 
Allow use the full version of ip

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2025-06-25 08:36:32 +10:00
dependabot[bot]
503fb7d871 Bump alpine from 3.21 to 3.22 in /src 
Bumps alpine from 3.21 to 3.22.

---
updated-dependencies:
- dependency-name: alpine
  dependency-version: '3.22'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-06 16:32:34 +00:00
LizenzFass78851
4016b9fd0b riscv64 build for FTL is available as a release 
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
 2025-06-06 15:42:05 +02:00
LizenzFass78851
60f9fa7f4c add individual tags for different architectures 
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
 2025-06-06 15:42:05 +02:00
LizenzFass78851
381411a4cb Set base image versions directly on FROM line 
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
 2025-06-06 15:26:17 +02:00
Adam Warner
0f586057de Remove RISCV builds for the time being 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-05-30 23:22:34 +01:00
Adam Warner
2a656e68df Allow for building the image against a fork of the core/web/padd repos - leave FTL for now. 
Undocumented as it's only really for internal use when testing contributor PRs for the core/web/padd repos.
 2025-05-30 23:10:59 +01:00
casperklein
1c8647f692 fix sunday 
Signed-off-by: casperklein <casperklein@users.noreply.github.com>
 2025-04-04 00:31:05 +02: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
Michael Woolweaver
aeb5e71f26 Set day of week for gravity update to be the same as bare metal install 
Signed-off-by: Michael Woolweaver <michael@woolweaver.bid>
 2025-03-15 10:59:20 -05:00
casperklein
ae82aad4e4 add bash-completion package 
Signed-off-by: casperklein <casperklein@users.noreply.github.com>
 2025-03-15 04:09:08 +01:00
Adam Warner
c26f896ba1 Merge pull request #1758 from pi-hole/secrets 
WEBPASSWORD_FILE is mounted to /run/secrets
 2025-03-04 17:37:05 +00:00
casperklein
747787c8a1 Add 123/udp to docker compose example and Dockerfile 
Signed-off-by: casperklein <casperklein@users.noreply.github.com>
 2025-03-03 01:30:22 +01:00
yubiuser
4fa81da1c9 Remove v5 migration leftover 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-25 13:18:33 +01: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
yubiuser
6324ec7d60 Merge pull request #1746 from pi-hole/healthcheck 
Honor configured DNS port for docker health check
 2025-02-24 19:52:22 +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
yubiuser
d09eb027d6 Don't rely on env variable but get port from FTL itself 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-23 13:33:25 +01:00
yubiuser
12b4af36ce Honor configured DNS port for docker health check 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-23 13:16:54 +01:00
Adam Warner
cbe32d6fba Re-expose ports 53/67/80/443 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-02-21 01:55:26 +00:00
yubiuser
d252307ca8 Print FTL version also when building the image 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-18 23:50:36 +01:00
Adam Warner
4f1f5a6b26 if we are building with FTL_BRANCH=master then grab the binary from the latest github release, otherwise grab it from ftl.pi-hole.net - this mirrors what happens in the main install script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-02-18 22:30:24 +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
Adam Warner
fba54e9f3f Merge pull request #1690 from pi-hole/UID 
Set default UID and GID to 1000
 2025-02-13 17:20:16 +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
yubiuser
a3c22ffadf Set the default GID and UID to 1000 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-10 18:17:37 +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