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,139 Commits 10 Branches 141 Tags
89e4a966e34419bee271407120f84dbed5e227b8
Commit Graph

2139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yubiuser
268434973d Merge pull request #1582 from pi-hole/dependabot/pip/test/dev/pytest-8.2.1 
Bump pytest from 8.2.0 to 8.2.1 in /test
 2024-05-25 21:54:27 +02:00
Christian König
6f0bbb7153 Fix codespell 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2024-05-25 21:51:50 +02:00
dependabot[bot]
3a76e3245f Bump pytest from 8.2.0 to 8.2.1 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.0 to 8.2.1.
- [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.2.0...8.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-25 10:29:53 +00:00
yubiuser
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
yubiuser
8eb20a7c64 Merge pull request #1580 from pi-hole/dependabot/github_actions/dev/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:27:01 +02:00
dependabot[bot]
c17f6bf671 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:27:57 +00:00
dependabot[bot]
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
Adam Warner
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
Adam Warner
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
yubiuser
7253da15bd Merge pull request #1575 from pi-hole/dependabot/pip/test/dev/pytest-8.2.0 
Bump pytest from 8.1.2 to 8.2.0 in /test
 2024-05-04 13:11:38 +02:00
dependabot[bot]
51f126108f Bump pytest from 8.1.2 to 8.2.0 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.2 to 8.2.0.
- [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.1.2...8.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-04 10:58:00 +00:00
yubiuser
2ad89055a6 Merge pull request #1574 from pi-hole/dependabot/pip/test/dev/pytest-xdist-3.6.1 
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
 2024-05-04 12:57:06 +02:00
dependabot[bot]
6990b09aa5 Bump pytest-xdist from 3.5.0 to 3.6.1 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.5.0 to 3.6.1.
- [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.5.0...v3.6.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-04 10:32:42 +00:00
Adam Warner
a0a24306d9 Merge pull request #1559 from pi-hole/dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.0 
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
 2024-04-28 15:36:33 +01:00
Adam Warner
007dc8018f Merge pull request #1556 from pi-hole/dependabot/github_actions/dev/Chizkiyahu/delete-untagged-ghcr-action-4 
Bump Chizkiyahu/delete-untagged-ghcr-action from 3 to 4
 2024-04-28 15:36:23 +01:00
Adam Warner
c2887aeffe Merge pull request #1567 from pi-hole/dependabot/pip/test/pip-150d523057 
Bump the pip group across 1 directory with 3 updates
2024.05.0 		2024-04-28 15:36:02 +01:00
yubiuser
4b9a8cabf6 Merge pull request #1572 from pi-hole/dependabot/pip/test/dev/black-24.4.2 
Bump black from 24.4.0 to 24.4.2 in /test
 2024-04-27 12:52:36 +02:00
dependabot[bot]
94cb08a972 Bump black from 24.4.0 to 24.4.2 in /test 
Bumps [black](https://github.com/psf/black) from 24.4.0 to 24.4.2.
- [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.4.0...24.4.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-27 10:50:34 +00:00
yubiuser
0b0db714a4 Merge pull request #1571 from pi-hole/dependabot/pip/test/dev/pytest-8.1.2 
Bump pytest from 8.1.1 to 8.1.2 in /test
 2024-04-27 12:49:33 +02:00
dependabot[bot]
0d64bb5665 Bump pytest from 8.1.1 to 8.1.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.1 to 8.1.2.
- [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.1.1...8.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-27 10:16:10 +00:00
Adam Warner
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
Jeff Miller
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
Adam Warner
7e5ab408ca Merge pull request #1563 from lemondjeff/dev 
Remove obsolete "version" value from example docker-compose.yml
 2024-04-20 16:31:49 +01:00
Jeff Miller
b033a18a24 Remove obsolete "version" value from example docker-compose.yml in README.md and from .yml files in 
examples 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 <36978574+lemondjeff@users.noreply.github.com>
 2024-04-20 08:23:47 -07:00
Adam Warner
0fd3ae682a Merge pull request #1554 from pi-hole/dependabot/pip/test/dev/pytest-8.1.1 
Bump pytest from 8.0.2 to 8.1.1 in /test
 2024-04-18 19:56:27 +01:00
dependabot[bot]
2783e38030 Bump pytest from 8.0.2 to 8.1.1 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.2 to 8.1.1.
- [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.0.2...8.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-18 18:54:26 +00:00
Adam Warner
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
dependabot[bot]
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
Adam Warner
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
Adam Warner
13a04a7705 Merge pull request #1566 from pi-hole/dependabot/pip/test/dev/black-24.4.0 
Bump black from 24.2.0 to 24.4.0 in /test
 2024-04-18 17:55:51 +01:00
dependabot[bot]
daf1e568bb Bump the pip group across 1 directory with 3 updates 
Bumps the pip group with 2 updates in the /test directory: [black](https://github.com/psf/black) and [aiohttp](https://github.com/aio-libs/aiohttp).


Updates `black` from 24.1.1 to 24.3.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.1.1...24.3.0)

Updates `aiohttp` from 3.9.1 to 3.9.4
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](https://github.com/aio-libs/aiohttp/compare/v3.9.1...v3.9.4)

Updates `idna` from 3.6 to 3.7
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](https://github.com/kjd/idna/compare/v3.6...v3.7)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: aiohttp
  dependency-type: indirect
  dependency-group: pip
- dependency-name: idna
  dependency-type: indirect
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-18 15:45:21 +00:00
dependabot[bot]
e5e6a2945b Bump black from 24.2.0 to 24.4.0 in /test 
Bumps [black](https://github.com/psf/black) from 24.2.0 to 24.4.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.2.0...24.4.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-04-13 10:22:16 +00:00
dependabot[bot]
db20909579 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-03-30 10:36:19 +00:00
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
dependabot[bot]
6c3b1e77bd Bump Chizkiyahu/delete-untagged-ghcr-action from 3 to 4 
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action) from 3 to 4.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases)
- [Commits](https://github.com/chizkiyahu/delete-untagged-ghcr-action/compare/v3...v4)

---
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-03-23 10:54:36 +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
yubiuser
061251e599 Merge pull request #1541 from pi-hole/dependabot/pip/test/dev/pytest-testinfra-10.1.0 
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test
 2024-03-02 13:01:15 +01:00
dependabot[bot]
146dc52b0b Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.0.0 to 10.1.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/10.0.0...10.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-02 11:59:23 +00:00
yubiuser
2bb820bec9 Merge pull request #1542 from pi-hole/dependabot/pip/test/dev/black-24.2.0 
Bump black from 24.1.1 to 24.2.0 in /test
 2024-03-02 12:58:11 +01:00
dependabot[bot]
23b3a42b78 Bump black from 24.1.1 to 24.2.0 in /test 
Bumps [black](https://github.com/psf/black) from 24.1.1 to 24.2.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.1.1...24.2.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-03-02 11:51:51 +00:00
yubiuser
f073ab3145 Merge pull request #1549 from pi-hole/dependabot/pip/test/dev/pytest-8.0.2 
Bump pytest from 8.0.0 to 8.0.2 in /test
 2024-03-02 12:50:57 +01:00
dependabot[bot]
02c93b362c Bump pytest from 8.0.0 to 8.0.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.2.
- [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.0.0...8.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-02 10:11:52 +00:00
Adam Warner
e3f158318c Merge pull request #1545 from pi-hole/master 
Sync master back into development
 2024-02-26 22:09:51 +00:00
Adam Warner
91ff5662c4 Merge pull request #1544 from pi-hole/dev 
Dev -> master
2024.03.1 2024.03.0 2024.03.2 2024.02.2 		2024-02-26 21:29:53 +00:00
yubiuser
b9676108e2 Merge pull request #1535 from pi-hole/dependabot/pip/test/dev/pytest-8.0.0 
Bump pytest from 7.4.4 to 8.0.0 in /test
 2024-02-04 16:36:31 +01:00
dependabot[bot]
e2035c184f Bump pytest from 7.4.4 to 8.0.0 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.4 to 8.0.0.
- [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.4.4...8.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-03 11:46:12 +00:00