Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
434 workflow runs
434 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Revert "Reintroduce missed docker secret handling" Check for merge conflicts #1121: Commit fb53198 pushed by PromoFaux
February 23, 2025 20:57 10s revert-1748-password_file
revert-1748-password_file
February 23, 2025 20:57 10s
Merge pull request #1748 from pi-hole/password_file Check for merge conflicts #1120: Commit 278a78c pushed by PromoFaux
February 23, 2025 18:51 2m 10s development
development
February 23, 2025 18:51 2m 10s
Reintroduce ability to set web password from using docker secrets. Check for merge conflicts #1119: Commit 9d55d91 pushed by PromoFaux
February 23, 2025 18:50 10s password_file
password_file
February 23, 2025 18:50 10s
Honor configured DNS port for docker health check Check for merge conflicts #1118: Pull request #1746 synchronize by yubiuser
February 23, 2025 12:33 10s
February 23, 2025 12:33 10s
Don't rely on env variable but get port from FTL itself Check for merge conflicts #1117: Commit d09eb02 pushed by yubiuser
February 23, 2025 12:33 10s healthcheck
healthcheck
February 23, 2025 12:33 10s
Honor configured DNS port for docker health check Check for merge conflicts #1116: Commit 12b4af3 pushed by yubiuser
February 23, 2025 12:17 12s healthcheck
healthcheck
February 23, 2025 12:17 12s
Include FTLCONF_dns_listeningMode: 'all' in the compose example file Check for merge conflicts #1115: Commit 3214973 pushed by yubiuser
February 22, 2025 10:18 10s example_interface
example_interface
February 22, 2025 10:18 10s
Allow custom web interface URI for Pi-hole admin Check for merge conflicts #1114: Pull request #1739 synchronize by pepramon
February 22, 2025 09:48 10s
February 22, 2025 09:48 10s
Merge pull request #1731 from pi-hole/development Check for merge conflicts #1113: Commit 29b604a pushed by PromoFaux
February 21, 2025 22:13 10s 2025.02.4
2025.02.4
February 21, 2025 22:13 10s
Merge pull request #1731 from pi-hole/development Check for merge conflicts #1112: Commit 29b604a pushed by PromoFaux
February 21, 2025 01:58 10s 2025.02.3
2025.02.3
February 21, 2025 01:58 10s
Merge pull request #1732 from pi-hole/master Check for merge conflicts #1111: Commit 70d8e10 pushed by PromoFaux
February 21, 2025 01:57 2m 9s development
development
February 21, 2025 01:57 2m 9s
Merge pull request #1731 from pi-hole/development Check for merge conflicts #1110: Commit 29b604a pushed by PromoFaux
February 21, 2025 01:57 2m 13s master
master
February 21, 2025 01:57 2m 13s
Merge pull request #1730 from pi-hole/expose Check for merge conflicts #1109: Commit 08997a9 pushed by PromoFaux
February 21, 2025 01:56 2m 11s development
development
February 21, 2025 01:56 2m 11s
Re-expose ports 53/67/80/443 Check for merge conflicts #1108: Pull request #1730 synchronize by PromoFaux
February 21, 2025 01:55 13s
February 21, 2025 01:55 13s
Re-expose ports 53/67/80/443 Check for merge conflicts #1107: Commit cbe32d6 pushed by PromoFaux
February 21, 2025 01:55 11s expose
expose
February 21, 2025 01:55 11s
Re-expose ports 53/67/80/443 Check for merge conflicts #1106: Commit c3c1084 pushed by PromoFaux
February 21, 2025 01:54 13s expose
expose
February 21, 2025 01:54 13s
Merge pull request #1702 from pi-hole/master Check for merge conflicts #1105: Commit fb590f0 pushed by PromoFaux
February 20, 2025 23:22 2m 9s development
development
February 20, 2025 23:22 2m 9s
Sync master back into development Check for merge conflicts #1104: Pull request #1702 synchronize by PromoFaux
February 20, 2025 23:22 2m 11s
February 20, 2025 23:22 2m 11s
Improve default docker compose file to inclide SYS_TIME and SYS_NICE Check for merge conflicts #1103: Commit 49215d7 pushed by PromoFaux
February 20, 2025 23:22 2m 9s master
master
February 20, 2025 23:22 2m 9s
Merge pull request #1727 from pi-hole/caps Check for merge conflicts #1102: Commit bfe28b3 pushed by PromoFaux
February 20, 2025 23:13 15s 2025.02.2
2025.02.2
February 20, 2025 23:13 15s
Sync master back into development Check for merge conflicts #1101: Pull request #1702 synchronize by PromoFaux
February 20, 2025 21:59 12s
February 20, 2025 21:59 12s
Merge pull request #1727 from pi-hole/caps Check for merge conflicts #1100: Commit bfe28b3 pushed by PromoFaux
February 20, 2025 21:59 2m 10s master
master
February 20, 2025 21:59 2m 10s
Sync master back into development Check for merge conflicts #1099: Pull request #1702 synchronize by PromoFaux
February 20, 2025 21:57 10s
February 20, 2025 21:57 10s
Merge pull request #1720 from pi-hole/padd Check for merge conflicts #1098: Commit a7e8d82 pushed by PromoFaux
February 20, 2025 21:57 2m 10s master
master
February 20, 2025 21:57 2m 10s
Sync master back into development Check for merge conflicts #1097: Pull request #1702 synchronize by PromoFaux
February 20, 2025 21:56 12s
February 20, 2025 21:56 12s