Commit Graph

1768 Commits

Author SHA1 Message Date
shamoon
1b6469ba74 Fix: correct dns upstreams variable name
Signed-off-by: shamoon <4887959+shamoon@users.noreply.github.com>
2024-03-28 11:40:01 -07:00
Adam Warner
2004ba2515 Merge pull request #1552 from pi-hole/v6/buildkit-fancyness
Update Dockerfile
2024-03-27 18:52:10 +00:00
Adam Warner
292a6b961c Update Dockerfile to use a nifty buildkit feature allowing us to either pull FTL from the web, or use a locally built copy.
Add a build script for ease of local building (separate from the build-and-test script).
Update Readme with build instructions

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-03-16 01:56:35 +00:00
Adam Warner
cdded14041 Merge pull request #1551 from pi-hole/v6/basic-tweaks
Tidy up a few things in the readme and code.
2024-03-16 01:03:39 +00:00
Adam Warner
24006c7a00 Address comments.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-03-11 18:14:26 +00:00
Adam Warner
9fefa11c41 Tidy up a few things in the readme and code.
Check that pihole-FTL is configured with upstream servers or it will not function!

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-03-10 19:29:38 +00:00
Adam Warner
2cabcc6fd1 Merge pull request #1529 from pi-hole/builder_fontend
Add dockerfile frontend syntax line
2024-01-12 19:19:07 +00:00
Christian König
24090b227e Add dockerfile frontend synatax line
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-10 13:49:05 +01:00
Adam Warner
ae7ea353f7 Merge pull request #1527 from pi-hole/v6/fix-actions-finally
Simplify build and publish action for v6
2024-01-07 21:57:33 +00:00
Adam Warner
d3bb3bdebb Simplify build and publish action for v6. No need to have an additional matrix for each registry
Remove un-needed action file

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-01-07 20:24:09 +00:00
Adam Warner
50b8c6418a Merge pull request #1526 from pi-hole/registry_digest
Consider registry when up/downloading artifacts
2024-01-07 13:12:58 +00:00
Christian König
f4f91f778c Consider registry when up/downloading artifacts
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-06 21:31:41 +01:00
yubiuser
0c9e8ee66f Merge pull request #1517 from pi-hole/artifacts
Artifacts v4
2024-01-06 13:27:53 +01:00
Christian König
0ba8648dbb Use ${{ env.PLATFORM_PAIR }}
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-06 13:21:32 +01:00
Christian König
d0f321b604 Simplify up/download
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-03 22:45:46 +01:00
Christian König
03a037994e Adjust workflow to run with artifacts v4
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-23 21:52:42 +01:00
Christian König
59abffe75b Update artifacts action to v4
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-23 21:26:36 +01:00
Adam Warner
174a39facd Merge pull request #1514 from pi-hole/revert-1505-dependabot/github_actions/development-v6/actions/upload-artifact-4
Revert "Bump actions/upload-artifact from 3 to 4"
2023-12-23 16:17:35 +00:00
Adam Warner
30f5524d81 Merge pull request #1513 from pi-hole/revert-1506-dependabot/github_actions/development-v6/actions/download-artifact-4
Revert "Bump actions/download-artifact from 3 to 4"
2023-12-23 16:16:59 +00:00
Adam Warner
9518e61cea Revert "Bump actions/upload-artifact from 3 to 4" 2023-12-23 16:16:23 +00:00
Adam Warner
b7fea60f18 Revert "Bump actions/download-artifact from 3 to 4" 2023-12-23 16:16:21 +00:00
Adam Warner
e40ebed3e7 Merge pull request #1505 from pi-hole/dependabot/github_actions/development-v6/actions/upload-artifact-4
Bump actions/upload-artifact from 3 to 4
2023-12-23 12:35:36 +00:00
dependabot[bot]
85995a460a Bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-23 12:35:13 +00:00
Adam Warner
1c9d9065f8 Merge pull request #1506 from pi-hole/dependabot/github_actions/development-v6/actions/download-artifact-4
Bump actions/download-artifact from 3 to 4
2023-12-23 12:34:36 +00:00
dependabot[bot]
2d799822b3 Bump actions/download-artifact from 3 to 4
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-23 12:24:30 +00:00
Adam Warner
7af4cd87f6 Merge pull request #1511 from pi-hole/fix/riscv64
Fix v6 build on riscv64
2023-12-23 12:23:52 +00:00
Christian König
90e45d7269 Fix v6 built on riscv
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-22 19:41:11 +01:00
yubiuser
a04a8abb9e Merge pull request #1497 from pi-hole/alpine3_19
Update alpine to 3.19
2023-12-22 15:08:33 +01:00
Christian König
5f8ca1822f Re-add importand comment line
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-17 13:42:19 +01:00
Christian König
59cfc75ae7 Remove pipenv and allow pip to install systemwide with --break-system-packages
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-17 13:38:35 +01:00
Christian König
775c3a8049 Update docker-cli also to v3.19
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-16 23:23:21 +01:00
Christian König
dbf3ddfa24 Update alpine to 3.19
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-16 23:23:21 +01:00
yubiuser
da2acb74fa Merge pull request #1502 from pi-hole/dependabot/pip/test/development-v6/black-23.12.0
Bump black from 23.11.0 to 23.12.0 in /test
2023-12-16 17:40:37 +01:00
dependabot[bot]
0290369f34 Bump black from 23.11.0 to 23.12.0 in /test
Bumps [black](https://github.com/psf/black) from 23.11.0 to 23.12.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/23.11.0...23.12.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-16 10:18:26 +00:00
yubiuser
d1ca7ff2d2 Merge pull request #1498 from pi-hole/dependabot/github_actions/development-v6/actions/stale-9.0.0
Bump actions/stale from 8.0.0 to 9.0.0
2023-12-09 12:44:29 +01:00
dependabot[bot]
8fc242c8b6 Bump actions/stale from 8.0.0 to 9.0.0
Bumps [actions/stale](https://github.com/actions/stale) from 8.0.0 to 9.0.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/v8.0.0...v9.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-09 10:36:29 +00:00
Adam Warner
7d8a7a114c Merge pull request #1494 from pi-hole/dependabot/pip/test/development-v6/pytest-xdist-3.5.0
Bump pytest-xdist from 3.4.0 to 3.5.0 in /test
2023-11-25 10:28:08 +00:00
dependabot[bot]
6842f000c1 Bump pytest-xdist from 3.4.0 to 3.5.0 in /test
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.4.0...v3.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-25 10:05:19 +00:00
yubiuser
d4ac13e567 Merge pull request #1488 from pi-hole/dependabot/pip/test/development-v6/black-23.11.0
Bump black from 23.10.1 to 23.11.0 in /test
2023-11-18 11:53:01 +01:00
dependabot[bot]
cb38658a93 Bump black from 23.10.1 to 23.11.0 in /test
Bumps [black](https://github.com/psf/black) from 23.10.1 to 23.11.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/23.10.1...23.11.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-18 10:49:49 +00:00
yubiuser
fdc37692fa Merge pull request #1490 from pi-hole/dependabot/pip/test/development-v6/pytest-xdist-3.4.0
Bump pytest-xdist from 3.3.1 to 3.4.0 in /test
2023-11-18 11:48:43 +01:00
dependabot[bot]
69f06b85bb Bump pytest-xdist from 3.3.1 to 3.4.0 in /test
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.3.1 to 3.4.0.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.3.1...v3.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-18 10:46:00 +00:00
yubiuser
a872683d32 Merge pull request #1489 from pi-hole/dependabot/pip/test/development-v6/pytest-testinfra-10.0.0
Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test
2023-11-18 11:44:54 +01:00
dependabot[bot]
022c0cc953 Bump pytest-testinfra from 9.0.0 to 10.0.0 in /test
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 9.0.0 to 10.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases)
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/9.0.0...10.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-18 10:08:58 +00:00
Adam Warner
ee4d73be63 Merge pull request #1486 from pi-hole/v6/fix-logrotate
install the logrotate file into /etc/pihole at startup in case of volume mounting
2023-11-06 21:57:53 +00:00
Adam Warner
7f89be5b1d install the logrotate file into /etc/pihole at startup in case of volume mounting
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-11-06 21:43:42 +00:00
Adam Warner
b9298ba0ce Merge pull request #1483 from pi-hole/fix/logrotate
Create dir for logrotate statefile
2023-11-03 23:20:54 +00:00
Christian König
8a6bda4a89 Create dir for logrotate statefile
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-11-03 22:05:29 +01:00
Adam Warner
91dffb6669 Merge pull request #1466 from pi-hole/v6/skip-skipgravity
Only run gravity on boot _if_ the gravity database does not exist
2023-11-03 14:25:14 +00:00
Adam Warner
23fe63dff6 Get rid of the SKIPGRAVITYONBOOT environment variable. Instead, only run gravity on a fresh volume if the gravity database does not exist. There isn't really any need for gravity to be updated on every start (current default behaviour)
This will still run the gravity migration scripts on every boot if the gravity database exists

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-11-03 14:22:43 +00:00