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

2320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d82ce16352 Merge pull request #1741 from pi-hole/example_interface 
Include FTLCONF_dns_listeningMode: 'all' in the compose example file
2025.02.7 		2025-02-25 05:51:48 +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
838a0203ee Merge pull request #1750 from pi-hole/password_file 
Reintroduce missed docker secret handling (Redo)
 2025-02-23 21:46:15 +00: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
9b34ecead5 Merge pull request #1749 from pi-hole/revert-1748-password_file 
Revert "Reintroduce missed docker secret handling"
 2025-02-23 20:58:13 +00:00
Adam Warner
fb53198670 Revert "Reintroduce missed docker secret handling" 2025-02-23 20:57:37 +00:00
Adam Warner
278a78cb2a Merge pull request #1748 from pi-hole/password_file 
Reintroduce missed docker secret handling
 2025-02-23 18:51:52 +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
yubiuser
3214973ce4 Include FTLCONF_dns_listeningMode: 'all' in the compose example file 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-22 11:18:48 +01:00
Adam Warner
70d8e10f38 Merge pull request #1732 from pi-hole/master 
Sync master back into development
 2025-02-21 01:57:38 +00:00
Adam Warner
29b604af3f Merge pull request #1731 from pi-hole/development 
Development
2025.02.3 2025.02.4 2025.02.6 2025.02.5 		2025-02-21 01:57:17 +00:00
Adam Warner
08997a98bf Merge pull request #1730 from pi-hole/expose 
Re-expose ports 53/67/80/443
 2025-02-21 01:56:49 +00: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
Adam Warner
fb590f0206 Merge pull request #1702 from pi-hole/master 
Sync master back into development
 2025-02-20 23:22:53 +00:00
yubiuser
49215d7908 Improve default docker compose file to inclide SYS_TIME and SYS_NICE 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-20 23:22:43 +00:00
yubiuser
bf364f9656 Amend README to include PADD branch in custom build steps 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-20 23:22:43 +00:00
yubiuser
da644fc086 Add note about FTLCONF_misc_etc_dnsmasq_d 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-20 23:22:43 +00:00
Adam Warner
e14124ca26 Update README.md 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-02-20 23:22:43 +00:00
Adam Warner
58fcd1fdcc Merge pull request #1700 from pi-hole/test/FTLvv 
Add test to output FTL's version information
 2025-02-18 23:10:15 +00:00
yubiuser
4abe9094c6 PEP8 requires all lowser case 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-18 23:52:37 +01: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
yubiuser
0020492a5b Add test to output FTL's version information 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-18 23:43:24 +01:00
Adam Warner
67bf23b135 Merge pull request #1698 from pi-hole/master 
Sync master back into development
 2025-02-18 22:38:00 +00:00
Adam Warner
2c408ccec4 Merge pull request #1697 from pi-hole/development 
Development -> master
2025.02.1 		2025-02-18 22:34:44 +00:00
Adam Warner
173b5e8c0d Merge pull request #1696 from pi-hole/tweak/ftl-download-location 
For release builds, grab the FTL binary from the github release
 2025-02-18 22:34:08 +00: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
Dominik
d6e5f963ac Merge pull request #1693 from pi-hole/master 
Sync master back into development
 2025-02-18 19:25:37 +01:00
Adam Warner
174128797c Merge pull request #1692 from pi-hole/development 
Development -> Master
2025.02.0 		2025-02-18 18:07:45 +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
Adam Warner
eaabf3afcb Merge pull request #1691 from pi-hole/Clean_up 
Remove unused DHCP_ACTIVE and fix shellcheck warnings
 2025-02-13 17:01:05 +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
7aee494667 Change readme 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-10 18:17:49 +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
yubiuser
75938e6798 Improve wording 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-10 17:21:42 +01:00
yubiuser
d13692ba19 Amend Readme regarding /etc-dnsmasq.d 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-02-10 17:12:53 +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
yubiuser
164cf4ac28 Merge pull request #1687 from jnodorp/patch-1 
Clarify log message for missing caps
 2025-02-08 08:39:21 +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
yubiuser
228608dea6 Merge pull request #1686 from pi-hole/dependabot/pip/test/development/black-25.1.0 
Bump black from 24.10.0 to 25.1.0 in /test
 2025-02-02 13:36:24 +01:00
dependabot[bot]
67c884d215 Bump black from 24.10.0 to 25.1.0 in /test 
Bumps [black](https://github.com/psf/black) from 24.10.0 to 25.1.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/24.10.0...25.1.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-02-01 10:18:19 +00:00
Adam Warner
15ee5f6c91 Merge pull request #1685 from pi-hole/dependabot/github_actions/development/actions/stale-9.1.0 
Bump actions/stale from 9.0.0 to 9.1.0
 2025-01-25 14:59:57 +00:00
dependabot[bot]
5404bf0322 Bump actions/stale from 9.0.0 to 9.1.0 
Bumps [actions/stale](https://github.com/actions/stale) from 9.0.0 to 9.1.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v9.0.0...v9.1.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-01-25 10:56:45 +00:00
yubiuser
820be486d6 Merge pull request #1681 from pi-hole/dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.3 
Bump eps1lon/actions-label-merge-conflict from 3.0.2 to 3.0.3
 2025-01-11 15:03:55 +01:00