Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-24 20:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,806 Commits 10 Branches 141 Tags
80bea32740e661286c20b4221945ac24ea3af6fd
Commit Graph

1806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
Adam Warner
2cabcc6fd1 Merge pull request #1529 from pi-hole/builder_fontend 
Add dockerfile frontend syntax line
 2024-01-12 19:19:07 +00:00
Christian König
24090b227e Add dockerfile frontend synatax line 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2024-01-10 13:49:05 +01:00
Adam Warner
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
Adam Warner
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
Adam Warner
50b8c6418a Merge pull request #1526 from pi-hole/registry_digest 
Consider registry when up/downloading artifacts
 2024-01-07 13:12:58 +00:00
Christian König
f4f91f778c Consider registry when up/downloading artifacts 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2024-01-06 21:31:41 +01:00