6657818f35
Merge pull request #1579 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.1
...
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
2024-05-11 14:30:28 +02:00
05c305b4af
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
...
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict ) from 3.0.0 to 3.0.1.
- [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.0...v3.0.1 )
---
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>
2024-05-11 10:18:26 +00:00
d2e46f3cec
Merge pull request #1576 from pi-hole/fix/grep-version
...
Install grep to avoid issues in pihole -w/b with the default busybox …
2024-05-09 08:42:57 +01:00
a49600e63d
Install grep to avoid issues in pihole -w/b with the default busybox grep
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-05-08 22:27:40 +01:00
9973fd9bf8
Merge pull request #1569 from lemondjeff/development-v6-issue-1562-take2
...
Remove obsolete "version" value from example docker-compose.yml files
2024-04-21 14:22:30 +01:00
e239b1cae6
Remove obsolete "version" value from example docker-compose.yml in README.md and from examples/docker-compose-caddy-proxy.yml since "Compose doesn't use version to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented."
...
See: https://github.com/compose-spec/compose-spec/blob/master/04-version-and-name.md
Signed-off-by: Jeff Miller <lemondjeff@gmail.com>
2024-04-20 15:51:01 -07:00
897baa69f0
Merge pull request #1558 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.0
...
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
2024-04-18 19:53:32 +01:00
2cfebe2cdf
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
...
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict ) from 2.1.0 to 3.0.0.
- [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/v2.1.0...v3.0.0 )
---
updated-dependencies:
- dependency-name: eps1lon/actions-label-merge-conflict
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-04-18 17:04:40 +00:00
4d68ee6af6
Merge pull request #1557 from shamoon/patch-1
...
Fix: correct dns upstreams `FTLCONF_dns_upstreams` variable name
2024-04-18 17:59:31 +01:00
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
2004ba2515
Merge pull request #1552 from pi-hole/v6/buildkit-fancyness
...
Update Dockerfile
2024-03-27 18:52:10 +00:00
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
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
24006c7a00
Address comments.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2024-03-11 18:14:26 +00:00
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
2cabcc6fd1
Merge pull request #1529 from pi-hole/builder_fontend
...
Add dockerfile frontend syntax line
2024-01-12 19:19:07 +00:00
24090b227e
Add dockerfile frontend synatax line
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-10 13:49:05 +01:00
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
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
50b8c6418a
Merge pull request #1526 from pi-hole/registry_digest
...
Consider registry when up/downloading artifacts
2024-01-07 13:12:58 +00:00
f4f91f778c
Consider registry when up/downloading artifacts
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-06 21:31:41 +01:00
0c9e8ee66f
Merge pull request #1517 from pi-hole/artifacts
...
Artifacts v4
2024-01-06 13:27:53 +01:00
0ba8648dbb
Use ${{ env.PLATFORM_PAIR }}
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-06 13:21:32 +01:00
d0f321b604
Simplify up/download
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2024-01-03 22:45:46 +01:00
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
59abffe75b
Update artifacts action to v4
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-23 21:26:36 +01:00
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
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
9518e61cea
Revert "Bump actions/upload-artifact from 3 to 4"
2023-12-23 16:16:23 +00:00
b7fea60f18
Revert "Bump actions/download-artifact from 3 to 4"
2023-12-23 16:16:21 +00:00
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
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
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
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
7af4cd87f6
Merge pull request #1511 from pi-hole/fix/riscv64
...
Fix v6 build on riscv64
2023-12-23 12:23:52 +00:00
90e45d7269
Fix v6 built on riscv
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-22 19:41:11 +01:00
a04a8abb9e
Merge pull request #1497 from pi-hole/alpine3_19
...
Update alpine to 3.19
2023-12-22 15:08:33 +01:00
5f8ca1822f
Re-add importand comment line
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-17 13:42:19 +01:00
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
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
dbf3ddfa24
Update alpine to 3.19
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-12-16 23:23:21 +01:00
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
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
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
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
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
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
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
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
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
yubiuser
dependabot[bot]
Adam Warner
Jeff Miller
shamoon
Adam Warner