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,175 Commits 10 Branches 141 Tags
850716201471435a8db2480cd14294605225207c
Commit Graph

2175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
f9d305635d Merge branch 'development' into master 2024-09-02 22:42:38 +01:00
yubiuser
15085ce33e Merge pull request #1635 from pi-hole/dependabot/pip/test/development/pytest-xdist-3.6.1 
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
 2024-09-02 23:31:05 +02:00
dependabot[bot]
8a2c70e961 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-09-02 21:30:03 +00:00
yubiuser
1ae858253a Merge pull request #1637 from pi-hole/dependabot/pip/test/development/pytest-8.3.2 
Bump pytest from 7.4 to 8.3.2 in /test
 2024-09-02 23:29:07 +02:00
dependabot[bot]
1a77fbdb81 Bump pytest from 7.4 to 8.3.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4 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/7.4.0...8.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-02 21:26:11 +00:00
yubiuser
98eb89d107 Merge pull request #1638 from pi-hole/dependabot/pip/test/development/pytest-testinfra-10.1.1 
Bump pytest-testinfra from 10.0.0 to 10.1.1 in /test
 2024-09-02 23:25:24 +02:00
dependabot[bot]
adc64d0db5 Bump pytest-testinfra from 10.0.0 to 10.1.1 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.0.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.0.0...10.1.1)

---
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-09-02 21:23:36 +00:00
yubiuser
a9a9a9a6ff Merge pull request #1636 from pi-hole/dependabot/pip/test/development/black-24.8.0 
Bump black from 23.12.0 to 24.8.0 in /test
 2024-09-02 23:22:49 +02:00
Adam Warner
a796a89d61 Merge branch 'development' into master 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 22:19:00 +01:00
Adam Warner
4cb3c3a16d Update branch name in sync-back-to-dev workflow 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 22:18:02 +01:00
dependabot[bot]
34f6116c83 Bump black from 23.12.0 to 24.8.0 in /test 
Bumps [black](https://github.com/psf/black) from 23.12.0 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/23.12.0...24.8.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-02 21:16:07 +00:00
Adam Warner
f96fddda41 Merge pull request #1633 from pi-hole/sort-master-scheduled-build 
[Housekeeping] Bring build script across from development
 2024-09-02 22:15:38 +01:00
Adam Warner
bd54136d08 update dependabot.yml to run against development not dev - remove v6 references 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 22:09:55 +01:00
Adam Warner
fa5344e16c remove old build scripts from master (we wont use them again) and bring accross the v6 one so that the nightly image is built using the correct branches 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 22:05:41 +01:00
Adam Warner
c38a6ea487 Merge pull request #1626 from pi-hole/development-v6 
Development v6 -> dev
 2024-09-02 21:59:46 +01:00
Adam Warner
d00f17f169 Merge pull request #1632 from pi-hole/build-scripts-once-v6-in-dev 
Final changes for merge to `development`
 2024-09-02 21:57:57 +01:00
Adam Warner
9e39ed34e0 Disbale arm64 testing for the time being 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 21:55:43 +01:00
Adam Warner
32c57752cf dev branch becomes development 
Default the component branches in Dockerfile to be `development` (might change to master after full v6 release)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 21:46:22 +01:00
Adam Warner
7a33749f4e Set the flavor and tags in the metadata base on the current build yaml for v5 namely: 
- schedule = nightly
 - latest = only on tag/publish
 - else branch name (on dev)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 18:36:20 +01:00
Adam Warner
26d0b85942 Quick rename (makes it easier to find in the required checks list) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 18:13:20 +01:00
Adam Warner
b012c809b1 Add src/pihole-FTL to .gitignore 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2024-09-02 17:34:47 +01:00
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