Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-19 18:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,204 Commits 10 Branches 141 Tags
875cf638aa6a5211a07c780f7769cab72b338b90
Commit Graph

2204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
442480448f Merge pull request #1629 from pi-hole/v6/migrate-v5-checks 
Be more graceful when detecting a v5->v6 migration
 2024-09-02 17:32:44 +01:00
Adam Warner
5a9e67025b * Clean up some of the output for the container startup 
* Only start tailing pihole-FTL log from most recent pihole-FTL start
* If v5 config files are detected, but no v6 files are, then we must defer some of the configuration until after FTL has migrated the files
* move some of the logic from start into bash_functions to make it easier to follow the start

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-08-25 22:29:20 +01:00
Adam Warner
bcc63933ae Merge pull request #1628 from pi-hole/default_tag 
Set default tag for locally build images to pihole:local
 2024-08-25 13:51:42 +01:00
Adam Warner
794ba9a552 Update Readme to reflect new local image tag name 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-08-25 13:45:08 +01:00
yubiuser
c0fa8de914 Set default tag for locally build images to pihole:local 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2024-08-25 11:51:13 +02:00
Adam Warner
13798f0987 Merge branch 'dev' into development-v6 2024-08-17 22:30:24 +01:00
Adam Warner
353094cf43 correct directory for local FTL binary 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-08-14 17:57:05 +01:00
Adam Warner
1c7d276aa2 Merge pull request #1621 from pi-hole/update-alpine 
Bump alpine to 3.20
 2024-08-09 14:50:16 +01:00
yubiuser
953cee4019 No need to remember to update the python version 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2024-08-09 12:21:08 +02:00
yubiuser
c0d822f35e Fix tests 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2024-08-07 21:45:19 +02:00
Adam Warner
1c6c1b3075 bump alpine to 3.20 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-08-06 16:18:10 +01:00
yubiuser
6239412098 Merge pull request #1620 from pi-hole/dependabot/pip/test/dev/black-24.8.0 
Bump black from 24.4.2 to 24.8.0 in /test
 2024-08-03 13:42:05 +02:00
dependabot[bot]
9a48b6daa1 Bump black from 24.4.2 to 24.8.0 in /test 
Bumps [black](https://github.com/psf/black) from 24.4.2 to 24.8.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.4.2...24.8.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-08-03 10:54:53 +00:00
Adam Warner
6568baf40d Merge pull request #1615 from loeffelpan/dev 
Add DNSMASQ_LISTENING=bind to README.md
 2024-07-28 18:29:10 +01:00
yubiuser
5e7d0b00c8 Merge pull request #1616 from pi-hole/dependabot/pip/test/dev/pytest-8.3.2 
Bump pytest from 8.2.2 to 8.3.2 in /test
 2024-07-27 13:42:54 +02:00
dependabot[bot]
69da4b28f5 Bump pytest from 8.2.2 to 8.3.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.2 to 8.3.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.2.2...8.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-27 10:10:28 +00:00
loeffelpan
8354b1b3a6 Add DNSMASQ_LISTENING=bind to README.md 
Signed-off-by: Jan Noormann <loeffelpan@erdmail.de>
 2024-07-27 10:41:33 +02:00
Adam Warner
bdd12787ce Merge pull request #1612 from pi-hole/master 
Sync master back into development
 2024-07-06 00:17:50 +01:00
Adam Warner
d4dd6b0a41 Merge pull request #1611 from pi-hole/dev 
Dev -> Master
 2024-07-05 22:40:52 +01:00
yubiuser
a3633a1732 Merge pull request #1609 from pi-hole/pretty_fail 
Add pytest-clarity to test environment to improve error log output
 2024-07-02 21:20:01 +02:00
Christian König
c26e71edfd Set column width to 120 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2024-07-02 21:14:40 +02:00
Christian König
80bea32740 Add pytest-clarity to test environment to improve error log output 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2024-07-02 21:14:40 +02:00
Adam Warner
e26f36620c Merge pull request #1608 from pi-hole/v6/default-upstream 
Default DNS Upstream
 2024-07-02 20:13:59 +01:00
Adam Warner
2922fbdc42 Update src/bash_functions.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2024-07-02 20:02:15 +01:00
Christian König
99f459e30f Using grep instead of tailing FTL.log as func.stdout only captures a few lines 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2024-06-30 23:30:22 +02:00
Adam Warner
a7565e2b23 Default upstream DNS to Google and remove the mention of the environment variable from the quickstart compose file. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-30 21:22:56 +01:00
yubiuser
c9a7c58dd3 Merge pull request #1604 from pi-hole/dependabot/github_actions/development-v6/docker/build-push-action-6 
Bump docker/build-push-action from 5 to 6
 2024-06-24 20:11:20 +02:00
dependabot[bot]
f610db6d0c Bump docker/build-push-action from 5 to 6 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 18:08:50 +00:00
Adam Warner
952096702c Merge pull request #1607 from pi-hole/tweaks 
Add support for choosing PADD branch in build script
 2024-06-24 19:07:39 +01:00
Christian König
d28c37e1e5 Remove entrypoint.sh as it is not needed 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2024-06-24 20:01:37 +02:00
Adam Warner
d4836d2215 Merge pull request #1605 from pi-hole/dependabot/github_actions/dev/docker/build-push-action-6 
Bump docker/build-push-action from 5 to 6
 2024-06-22 12:50:09 +01:00
Adam Warner
20145db333 silende JSONArgsRecommended warning in test build 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-22 12:44:12 +01:00
Adam Warner
425ecb39b8 Not sure how this ever worked, or why it has suddenly started causing issues if it did work. 
Remove trailing `.` from the pytest version in requirements.txt

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-22 12:36:51 +01:00
Adam Warner
f9dd3dfa1d Add PADD branch switch to build script. Fix casing of as->AS in Dockerfile to silence a warning about casing 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-22 12:21:28 +01:00
dependabot[bot]
859e71b01e Bump docker/build-push-action from 5 to 6 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-22 10:42:34 +00:00
Adam Warner
fcacd2f71a Merge pull request #1601 from pi-hole/master 
Sync master back into development
 2024-06-16 10:31:08 +01:00
Adam Warner
4149693092 Merge pull request #1600 from pi-hole/dev 
dev -> Master
2024.06.0 2024.07.0 		2024-06-16 10:26:21 +01:00
Adam Warner
f60e95838b Merge pull request #1599 from pi-hole/tweak/386-workaround 
[v5] Fix architecture detection for linux/386 images
 2024-06-15 17:53:58 +01:00
Adam Warner
eda9fdcf8d fall back to using dpkg when arch is detected as x86_64 to make sure we're not really on an i386 image to prevent wrong s6 overlay version being downloaded on a 32 bit image 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-06-15 17:02:02 +01:00
Adam Warner
56c110a2cc Merge pull request #1598 from alexis-opolka/master 
Update github user reference
 2024-06-12 13:11:19 +01:00
alexis-opolka
ecdaa43033 Update github user reference 
Signed-off-by: alexis-opolka <53085471+alexis-opolka@users.noreply.github.com>
 2024-06-12 03:25:36 +02:00
yubiuser
b799ee35f5 Merge pull request #1597 from pi-hole/dependabot/pip/test/dev/pytest-8.2.2 
Bump pytest from 8.2.1 to 8.2.2 in /test
 2024-06-08 14:33:08 +02:00
dependabot[bot]
13af8e5c60 Bump pytest from 8.2.1 to 8.2.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.1 to 8.2.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.2.1...8.2.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-06-08 10:48:07 +00:00
Dominik
80c829965b Merge pull request #1596 from pi-hole/new/ntp 
Add CAP_SYS_TIME in the container if available
 2024-06-08 11:14:22 +02:00
DL6ER
63f36bfdd5 Add CAP_SYS_TIME in the container if available 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2024-06-08 11:04:52 +02:00
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