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,135 Commits 10 Branches 141 Tags
0d241ef7a8e6fd15661cf757ed0fcc23154a46be
Commit Graph

2135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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