Commit Graph

1745 Commits

Author SHA1 Message Date
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
d4dd6b0a41 Merge pull request #1611 from pi-hole/dev
Dev -> Master
2024-07-05 22:40:52 +01: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
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
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
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
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]
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
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
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
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
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
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
dependabot[bot]
daf1e568bb Bump the pip group across 1 directory with 3 updates
Bumps the pip group with 2 updates in the /test directory: [black](https://github.com/psf/black) and [aiohttp](https://github.com/aio-libs/aiohttp).


Updates `black` from 24.1.1 to 24.3.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.1.1...24.3.0)

Updates `aiohttp` from 3.9.1 to 3.9.4
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](https://github.com/aio-libs/aiohttp/compare/v3.9.1...v3.9.4)

Updates `idna` from 3.6 to 3.7
- [Release notes](https://github.com/kjd/idna/releases)
- [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
- [Commits](https://github.com/kjd/idna/compare/v3.6...v3.7)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: aiohttp
  dependency-type: indirect
  dependency-group: pip
- dependency-name: idna
  dependency-type: indirect
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-18 15:45:21 +00:00
dependabot[bot]
e5e6a2945b Bump black from 24.2.0 to 24.4.0 in /test
Bumps [black](https://github.com/psf/black) from 24.2.0 to 24.4.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.2.0...24.4.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-04-13 10:22:16 +00:00
dependabot[bot]
db20909579 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-03-30 10:36:19 +00:00
dependabot[bot]
6c3b1e77bd Bump Chizkiyahu/delete-untagged-ghcr-action from 3 to 4
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action) from 3 to 4.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases)
- [Commits](https://github.com/chizkiyahu/delete-untagged-ghcr-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: Chizkiyahu/delete-untagged-ghcr-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-23 10:54:36 +00:00
yubiuser
061251e599 Merge pull request #1541 from pi-hole/dependabot/pip/test/dev/pytest-testinfra-10.1.0
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test
2024-03-02 13:01:15 +01:00
dependabot[bot]
146dc52b0b Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.0.0 to 10.1.0.
- [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.0)

---
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-03-02 11:59:23 +00:00
yubiuser
2bb820bec9 Merge pull request #1542 from pi-hole/dependabot/pip/test/dev/black-24.2.0
Bump black from 24.1.1 to 24.2.0 in /test
2024-03-02 12:58:11 +01:00
dependabot[bot]
23b3a42b78 Bump black from 24.1.1 to 24.2.0 in /test
Bumps [black](https://github.com/psf/black) from 24.1.1 to 24.2.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.1.1...24.2.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-03-02 11:51:51 +00:00
yubiuser
f073ab3145 Merge pull request #1549 from pi-hole/dependabot/pip/test/dev/pytest-8.0.2
Bump pytest from 8.0.0 to 8.0.2 in /test
2024-03-02 12:50:57 +01:00
dependabot[bot]
02c93b362c Bump pytest from 8.0.0 to 8.0.2 in /test
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.0 to 8.0.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.0.0...8.0.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-03-02 10:11:52 +00:00
Adam Warner
e3f158318c Merge pull request #1545 from pi-hole/master
Sync master back into development
2024-02-26 22:09:51 +00:00
Adam Warner
91ff5662c4 Merge pull request #1544 from pi-hole/dev
Dev -> master
2024.03.1 2024.03.0 2024.03.2 2024.02.2
2024-02-26 21:29:53 +00:00