Commit Graph

2204 Commits

Author SHA1 Message Date
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
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