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,159 Commits 10 Branches 141 Tags
c2e0671c0d825b6c0cdf571b36330fc52d169312
Commit Graph

2159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
60d8067d75 Merge pull request #1594 from pi-hole/tweak/readme 
Use correct delimeter in example compose file
 2024-06-05 21:17:50 +01:00
Adam Warner
f34c9c8c45 Update DNS upstream servers in quick start compose example to use semicolon as separator 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-05 21:03:40 +01:00
Adam Warner
435ab307ed Merge pull request #1593 from pi-hole/v6/readme 
Tweaks to readme for v6
 2024-06-02 15:53:18 +01:00
Adam Warner
d44789054c Add note about FTL reverting to default if env var is unset 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-02 15:24:55 +01:00
Adam Warner
259e3bd755 Remove no-longer-existing env variable from Advanced Variables section 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-02 15:23:04 +01:00
yubiuser
ee6e970768 Merge pull request #1592 from pi-hole/dependabot/pip/test/dev/pytest-testinfra-10.1.1 
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test
 2024-06-01 13:04:49 +02:00
yubiuser
0f530a6ee6 Merge pull request #1591 from pi-hole/dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2 
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
 2024-06-01 13:04:04 +02:00
yubiuser
a641a8f399 Merge pull request #1590 from pi-hole/dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.2 
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
 2024-06-01 13:01:34 +02:00
dependabot[bot]
0b08884bcb Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.1.0 to 10.1.1.
- [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.1.0...10.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-01 10:40:10 +00:00
dependabot[bot]
42fab8748b Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.1 to 3.0.2.
- [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.1...v3.0.2)

---
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-06-01 10:35:42 +00:00
dependabot[bot]
70f9bfe3f1 Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.1 to 3.0.2.
- [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.1...v3.0.2)

---
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-06-01 10:26:23 +00:00
Adam Warner
7e5daa3667 Merge pull request #1589 from pi-hole/master 
Sync master back into development
 2024-05-30 13:09:03 +01:00
Adam Warner
f77e922a89 Merge pull request #1588 from pi-hole/dev 
Dev -> master
 2024-05-30 13:07:49 +01:00
Adam Warner
ad108fee3f Merge branch 'master' into dev 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-05-30 13:06:27 +01:00
Adam Warner
be48e1186b Merge pull request #1586 from pi-hole/fix/build.sh_help 
Add forgotten `--load` argument to the help text
 2024-05-28 09:28:26 +01:00
RD WebDesign
d7418575e8 Add forgotten --load argument to the help text 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
 2024-05-27 22:09:45 -03:00
Adam Warner
0b8ad5cc99 Merge pull request #1585 from pi-hole/tweak/build.sh 
Change default value of PIHOLE_DOCKER_TAG arg in dockerfile
 2024-05-27 23:05:33 +01:00
Adam Warner
4c8066a9e0 Change default value of PIHOLE_DOCKER_TAG in dockerfile 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-05-27 22:42:15 +01:00
Adam Warner
7442d19e46 Merge pull request #1583 from pi-hole/tweak/build.sh 
Update DOCKER_BUILD_CMD in build.sh to include the "--load" flag
 2024-05-27 18:20:57 +01:00
Adam Warner
fdfc6ce036 Update DOCKER_BUILD_CMD in build.sh to include the "--load" flag 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-05-27 18:05:20 +01:00
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