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,187 Commits 10 Branches 141 Tags
8e04e6b2096d73a4a9432445b6816db34d22e5af
Commit Graph

2187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
8e04e6b209 Merge pull request #1846 from pi-hole/development 
Development
2025.06.2 		2025-06-12 17:11:22 +02:00
Adam Warner
5f0bd3ac76 Merge pull request #1842 from pi-hole/no/actions 
Remove composite login action
 2025-06-08 16:12:17 +01:00
yubiuser
2a6d9c22bb Remove composite login action 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-06-08 16:44:35 +02:00
Adam Warner
5689621a79 Merge pull request #1826 from pi-hole/master 
Sync master back into development
 2025-06-07 19:40:02 +01:00
Dominik
68dca72435 Merge branch 'development' into master 2025-06-07 20:26:57 +02:00
yubiuser
52df68fb16 Merge pull request #1840 from pi-hole/dependabot/github_actions/dot-github/actions/login-repo/development/docker/login-action-3 
Bump docker/login-action from 2 to 3 in /.github/actions/login-repo
 2025-06-07 12:41:59 +02:00
dependabot[bot]
299c6743da Bump docker/login-action from 2 to 3 in /.github/actions/login-repo 
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: '3'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-07 10:36:20 +00:00
Dominik
86c1c0c166 Merge branch 'development' into master 2025-06-07 12:35:17 +02:00
Dominik
8507162014 Merge pull request #1838 from pi-hole/dependabot/actions 
Run dependabot on composite actions
 2025-06-07 12:34:58 +02:00
yubiuser
49d7d1ee34 Merge pull request #1839 from pi-hole/dependabot/pip/test/development/pytest-8.4.0 
Bump pytest from 8.3.5 to 8.4.0 in /test
 2025-06-07 12:33:07 +02:00
dependabot[bot]
a8b5753dc9 Bump pytest from 8.3.5 to 8.4.0 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.5 to 8.4.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.3.5...8.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-07 10:20:05 +00:00
yubiuser
ff8bfb6011 Run dependabot on composite actions 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-06-07 06:52:32 +02:00
Adam Warner
b56e67ef68 Merge pull request #1837 from pi-hole/development 
Set base image versions directly on FROM line
2025.06.1 		2025-06-06 20:33:21 +01:00
Adam Warner
8b690463e8 Merge pull request #1835 from pi-hole/update/test_container 
Update test container to 28.2.2.-cli-alpine3.22
 2025-06-06 19:41:39 +01:00
yubiuser
a6a6f78498 Merge pull request #1836 from pi-hole/fic/codeowners 
Fix embarrassing  copy&paste error in CODEOWNERS
 2025-06-06 20:39:24 +02:00
yubiuser
6538124d21 Fix embarrassing copy&paste error in CODEOWNERS 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-06-06 20:34:00 +02:00
yubiuser
0a16b5fcbc Update test container to 28.2.2.-cli-alpine3.22 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-06-06 20:28:01 +02:00
yubiuser
6885932b1d Merge pull request #1833 from pi-hole/dependabot/docker/src/development/alpine-3.22 
Bump alpine from 3.21 to 3.22 in /src
 2025-06-06 18:40:28 +02:00
dependabot[bot]
503fb7d871 Bump alpine from 3.21 to 3.22 in /src 
Bumps alpine from 3.21 to 3.22.

---
updated-dependencies:
- dependency-name: alpine
  dependency-version: '3.22'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-06 16:32:34 +00:00
yubiuser
5804755ea2 Merge pull request #1827 from pi-hole/dependabot/pip/test/development/pytest-xdist-3.7.0 
Bump pytest-xdist from 3.6.1 to 3.7.0 in /test
 2025-06-06 18:31:13 +02:00
dependabot[bot]
bb0c4e6a13 Bump pytest-xdist from 3.6.1 to 3.7.0 in /test 
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.6.1 to 3.7.0.
- [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.6.1...v3.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-06 16:26:36 +00:00
yubiuser
aa1cc8b86b Merge pull request #1832 from LizenzFass78851/fix/docker-base-update 
fix: docker base version detection for dependabot
 2025-06-06 18:23:23 +02:00
LizenzFass78851
4016b9fd0b riscv64 build for FTL is available as a release 
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
 2025-06-06 15:42:05 +02:00
LizenzFass78851
06df7ed755 adjust gh action because versions tagging is done in dockerfile 
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
 2025-06-06 15:42:05 +02:00
LizenzFass78851
60f9fa7f4c add individual tags for different architectures 
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
 2025-06-06 15:42:05 +02:00
LizenzFass78851
381411a4cb Set base image versions directly on FROM line 
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
 2025-06-06 15:26:17 +02:00
Adam Warner
152dd7a3b1 Merge branch 'development' 2025.06.0 2025-06-06 08:51:13 +01:00
Adam Warner
dc34385007 Only build development branches of components for nightly tag, else use released components 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-06-05 19:47:32 +01:00
Adam Warner
c2e0671c0d Merge branch 'development' 2025-06-05 19:31:34 +01:00
Adam Warner
4f34e6fcb0 Add RISC image back now that the FTL build for RISC is fixed 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-06-05 18:06:07 +01:00
Adam Warner
d06c0a6aed Merge pull request #1825 from pi-hole/development 
dev -> master for release
2025.05.0 2025.05.1 		2025-05-30 23:49:25 +01:00
Adam Warner
ad1288d69f spelling 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-05-30 23:34:10 +01:00
Adam Warner
ac1b9dcaa1 Clarify warning on readme 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-05-30 23:26:50 +01:00
Adam Warner
21beb370b0 Merge pull request #1823 from FreSchNDE/update-readme-web-port-info 
Improve Tips section: clarify webserver port conflict handling
 2025-05-30 23:24:47 +01:00
Adam Warner
0f586057de Remove RISCV builds for the time being 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2025-05-30 23:22:34 +01:00
Adam Warner
2a656e68df Allow for building the image against a fork of the core/web/padd repos - leave FTL for now. 
Undocumented as it's only really for internal use when testing contributor PRs for the core/web/padd repos.
 2025-05-30 23:10:59 +01:00
FreSchNDE
0853bb034d Merge branch 'development' into update-readme-web-port-info 2025-05-30 16:47:54 +02:00
FreSchNDE
b2b67d7c13 Improved web port conflict instructions in README 
Signed-off-by: FreSchNDE <129771532+FreSchNDE@users.noreply.github.com>
 2025-05-28 18:55:18 +02:00
Adam Warner
28641b7909 Merge pull request #1820 from pi-hole/codeowner 
Use CODEOWNERS instead of deprecated dependbot/reviewers
 2025-05-06 17:47:01 +01:00
yubiuser
5cb3b3a90a Use CODEOWNERS instead of deprecated dependbot/reviewers 
Signed-off-by: yubiuser <github@yubiuser.dev>
 2025-05-03 20:13:15 +02:00
yubiuser
1cc5197d51 Merge pull request #1808 from pi-hole/dependabot/pip/test/development/pytest-testinfra-10.2.2 
Bump pytest-testinfra from 10.1.1 to 10.2.2 in /test
 2025-04-05 13:13:27 +02:00
dependabot[bot]
d214f2dcf1 Bump pytest-testinfra from 10.1.1 to 10.2.2 in /test 
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.1.1 to 10.2.2.
- [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.1...10.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-04-05 10:24:53 +00:00
Adam Warner
4decae85fb Merge pull request #1805 from pi-hole/development 
Dev -> Master
2025.04.0 		2025-04-04 18:51:28 +01:00
Adam Warner
3c86c4a7ac Merge pull request #1804 from casperklein/fix-crond 
Fix sunday cronjob
 2025-04-04 18:50:59 +01:00
casperklein
c4c3c3065a add test: check if cronfile has a valid syntax 
Signed-off-by: casperklein <casperklein@users.noreply.github.com>
 2025-04-04 19:16:10 +02:00
casperklein
1c8647f692 fix sunday 
Signed-off-by: casperklein <casperklein@users.noreply.github.com>
 2025-04-04 00:31:05 +02:00
Adam Warner
f9b2f9a8fb Merge pull request #1800 from pi-hole/master 
Sync master back into development
 2025-03-30 18:30:13 +01:00
Adam Warner
1213fc630d Merge pull request #1799 from pi-hole/development 
Development
2025.03.1 		2025-03-30 18:25:17 +01:00
Adam Warner
89e4a966e3 Merge branch 'master' into development 2025-03-30 18:21:37 +01:00
Adam Warner
5799c2356d Merge pull request #1794 from LizenzFass78851/fix/alpine-issue-2 
fix: alpine issue pt. 2
 2025-03-24 21:59:42 +00:00