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

179 Commits

Author SHA1 Message Date
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
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
DL6ER
bcb4e28deb Bake debugging requirements into the nightly image for ease of debugging 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-12-28 11:44:57 +01:00
RD WebDesign
6721fa2a85 Update base image to Alpine 3.21 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2024-12-09 15:33:38 -03:00
Adam Warner
a070b944c4 Remove tini from image, we don't need it as we're handling all the exits etc in start.sh 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-10-11 18:14:46 +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
e938d1a39b Actually do something with the result of readelf in case of invalid FTL binary 
Remove the `cat` of the pihole-FTL binary as it could lead to a very difficult to read logs
Add some more helpful output to the build script

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-11 19:09:35 +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
32c57752cf dev branch becomes development 
Default the component branches in Dockerfile to be `development` (might change to master after full v6 release)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 21:46:22 +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
353094cf43 correct directory for local FTL binary 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-08-14 17:57:05 +01:00
Adam Warner
1c6c1b3075 bump alpine to 3.20 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-08-06 16:18:10 +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
Adam Warner
f9dd3dfa1d Add PADD branch switch to build script. Fix casing of as->AS in Dockerfile to silence a warning about casing 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-22 12:21:28 +01:00