Commit Graph

1750 Commits

Author SHA1 Message Date
Adam Warner 83e918efb9
Rebase on development-v6, roll in changes based on comments by @yubiuser
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-12-23 12:47:57 +00:00
Adam Warner 69807c04e8
Attempt to download FTL before cloning the other component repos
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-12-23 12:40:16 +00:00
Adam Warner 8549432d67
Fail hard if TARGETPLATFORM does not meet one of the predefined values
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-12-23 12:40:16 +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
Adam Warner 69e2b598c8
Merge pull request #1479 from pi-hole/dependabot/pip/test/development-v6/pytest-7.4.3
Bump pytest from 7.1.3 to 7.4.3 in /test
2023-11-03 14:18:42 +00:00
dependabot[bot] a651b0bfab
Bump pytest from 7.1.3 to 7.4.3 in /test
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.3 to 7.4.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/7.1.3...7.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 17:46:30 +00:00
Adam Warner be014198ad
Merge pull request #1481 from pi-hole/dependabot/pip/test/development-v6/pytest-xdist-3.3.1
Bump pytest-xdist from 2.5.0 to 3.3.1 in /test
2023-11-01 17:44:56 +00:00
dependabot[bot] cecdae4dbd
Bump pytest-xdist from 2.5.0 to 3.3.1 in /test
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 2.5.0 to 3.3.1.
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v2.5.0...v3.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 17:42:04 +00:00
Adam Warner 8a1f3dfef5
Merge pull request #1477 from pi-hole/dependabot/pip/test/development-v6/pytest-testinfra-9.0.0
Bump pytest-testinfra from 6.8.0 to 9.0.0 in /test
2023-11-01 17:41:07 +00:00
dependabot[bot] ae85a85d12
Bump pytest-testinfra from 6.8.0 to 9.0.0 in /test
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 6.8.0 to 9.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/6.8.0...9.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-01 17:26:35 +00:00
Adam Warner 721dd31140
Merge pull request #1475 from pi-hole/dependabot/pip/test/development-v6/black-23.10.1
Bump black from 22.8.0 to 23.10.1 in /test
2023-11-01 17:25:38 +00:00
Adam Warner f36583446b
Merge pull request #1470 from pi-hole/logrotate
Install logrotate
2023-11-01 17:24:51 +00:00
dependabot[bot] 822a9c515e
Bump black from 22.8.0 to 23.10.1 in /test
Bumps [black](https://github.com/psf/black) from 22.8.0 to 23.10.1.
- [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/22.8.0...23.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-31 21:15:01 +00:00
Christian König 06819bdd51
Install logrotate
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-31 21:16:05 +01:00
Christian König c9e23f5a92
/etc/pihole is already created within the Dockerfile
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-30 23:34:48 +01:00
Christian König 752c49e5de
Install logrotate from repo
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-30 23:31:40 +01:00
Adam Warner 5b7fd46af6
Merge pull request #1468 from pi-hole/v6/tweak-tests
drop the `/v8` from `linux/arm64/v8`
2023-10-30 22:08:42 +00:00
Adam Warner 234dd6c849
Drop the /v8 from `linux/arm64/v8`
1f6a1a438c/cli/command/manifest/util.go (L34)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-30 21:51:29 +00:00
Adam Warner b688b46f13
linux/arm64/v8 should be linux/arm64.
This is a regression, added a note to make sure it does not happen again

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-30 21:22:18 +00:00
Christian König f31b4694c8
Delimter for array type FTLCONF_ values is ;
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-10-29 20:55:41 +00:00
Adam Warner 230e14e633
Merge pull request #1464 from pi-hole/v6/tweak_delimiter
Clarify delimter for array type FTLCONF_ values
2023-10-29 18:10:39 +00:00
Adam Warner 9928cfa630
Clarify delimter for array type FTLCONF_ values
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-10-29 17:48:24 +00:00