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,083 Commits 10 Branches 141 Tags
75938e67981c92039569b7ea049f57321292768b
Commit Graph

2083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dependabot[bot]
d5aa4d25d4 Bump eps1lon/actions-label-merge-conflict from 3.0.2 to 3.0.3 
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases)
- [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eps1lon/actions-label-merge-conflict/compare/v3.0.2...v3.0.3)

---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-01-11 10:33:03 +00:00
yubiuser
0976be7f90 Merge pull request #1678 from pi-hole/dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-6 
Bump Chizkiyahu/delete-untagged-ghcr-action from 5 to 6
 2025-01-06 10:49:22 +01:00
yubiuser
8f879498e8 Login action is part of the delete-untagged action now 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-01-06 10:47:18 +01:00
dependabot[bot]
59d9218051 Bump Chizkiyahu/delete-untagged-ghcr-action from 5 to 6 
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action) from 5 to 6.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases)
- [Commits](https://github.com/chizkiyahu/delete-untagged-ghcr-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: Chizkiyahu/delete-untagged-ghcr-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-01-04 10:26:59 +00:00
Dominik
7acd0d4223 Merge pull request #1675 from pi-hole/new/debug_at_night 
Bake debugging requirements into the nightly image for ease of debugging
 2024-12-28 12:49:59 +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
yubiuser
bfcdafc69a Merge pull request #1674 from pi-hole/fix/caddy 
Pi-hole does not provide DNS-over-TLS
 2024-12-22 20:16:40 +01:00
yubiuser
4a17221745 Pi-hole does not provide DNS-over-TLS 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2024-12-22 14:42:48 +01:00
RD WebDesign
4aecdbe775 Merge pull request #1671 from pi-hole/alpine_321 
Bump base image to Alpine 3.21
 2024-12-09 17:40:52 -03: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
yubiuser
1daf4e25bb Merge pull request #1669 from pi-hole/dependabot/pip/test/development/pytest-8.3.4 
Bump pytest from 8.3.3 to 8.3.4 in /test
 2024-12-07 15:33:32 +01:00
dependabot[bot]
d722db6595 Bump pytest from 8.3.3 to 8.3.4 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.3 to 8.3.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.3.3...8.3.4)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-12-07 10:42:33 +00:00
Dominik
40386c8f05 Merge pull request #1644 from pi-hole/sanity-check-downloaded-FTL 
Add some hardening to the build script
 2024-11-22 18:37:36 +01:00
yubiuser
eb8b5af7dc Merge pull request #1659 from pi-hole/dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-5 
Bump Chizkiyahu/delete-untagged-ghcr-action from 4 to 5
 2024-11-16 12:29:07 +01:00
dependabot[bot]
7e0c93b03a Bump Chizkiyahu/delete-untagged-ghcr-action from 4 to 5 
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action) from 4 to 5.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases)
- [Commits](https://github.com/chizkiyahu/delete-untagged-ghcr-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: Chizkiyahu/delete-untagged-ghcr-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-11-16 10:23:23 +00:00
RD WebDesign
4e1a66a757 Merge pull request #1646 from pi-hole/tweak/README_v6 
Tweak README text and formatting
 2024-11-09 19:45:22 -03:00
Adam Warner
8faa60a1ca Update README.md 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2024-11-03 15:56:59 +00:00
RD WebDesign
be8e292318 Improve BREAKING CHANGES text 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2024-10-28 16:07:00 -03:00
RD WebDesign
f755a0220c Add a few punctuation marks and remove trailing spaces. 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2024-10-28 16:03:30 -03:00
yubiuser
3470a39e17 Merge pull request #1652 from pi-hole/dependabot/pip/test/development/black-24.10.0 
Bump black from 24.8.0 to 24.10.0 in /test
 2024-10-12 16:17:15 +02:00
dependabot[bot]
8f376ea23e Bump black from 24.8.0 to 24.10.0 in /test 
Bumps [black](https://github.com/psf/black) from 24.8.0 to 24.10.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.8.0...24.10.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-12 10:53:39 +00:00
Adam Warner
e5277ce1b4 Merge pull request #1651 from pi-hole/tini-not-needed 
Remove tini from image, we don't need it as we're handling all the ex…
 2024-10-11 18:48:56 +01: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
d762e9140c Merge pull request #1649 from pi-hole/terminate-with-FTL 
Always terminate the container if pihole-FTL binary exits
 2024-10-10 21:18:54 +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
RD WebDesign
ba5d35dfae Merge branch 'development' into tweak/README_v6 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2024-09-25 13:26:28 -03:00
Adam Warner
89eb7f6b0d Correct the documentation for the TAIL_FTL_LOG variable 2024-09-25 15:28:01 +01:00
yubiuser
5f3b829dc5 Merge pull request #1648 from pi-hole/dependabot/pip/test/development/pytest-8.3.3 
Bump pytest from 8.3.2 to 8.3.3 in /test
 2024-09-14 12:52:36 +02:00
dependabot[bot]
3070e68ca8 Bump pytest from 8.3.2 to 8.3.3 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.2 to 8.3.3.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/8.3.2...8.3.3)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-14 10:50:57 +00:00
yubiuser
c020a70d0c Merge pull request #1647 from IngmarStein/patch-1 
Update README.md
 2024-09-14 09:55:52 +02:00
Ingmar Stein
39f5df9866 Update README.md 
Add a missing word in the description of the `TAIL_FTL_LOG` variable.

Signed-off-by: Ingmar Stein <IngmarStein@users.noreply.github.com>
 2024-09-14 09:49:48 +02:00
RD WebDesign
a780403fa5 Tweak Readme text and formatting 
mainly format changes, removal of trailing spaces, addition or removal
of line breaks and some text corrections

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2024-09-13 16:29:42 -03:00
RD WebDesign
ca7637decd Use the same logo and header used in web repo 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2024-09-13 16:04:04 -03:00
RD WebDesign
17279be549 Use a better format for the "BREAKING CHANGES" alert 
and set the new version number to v6

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2024-09-13 16:02:36 -03:00