docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-25 00:37:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'development-v6' into development-v6-issue-1562

Browse Source
This commit is contained in:
lemondjeff 2024-04-20 15:47:03 -07:00 committed by GitHub
commit 6fcc5e5bad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/merge-conflict.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check if PRs are have merge conflicts
uses: eps1lon/actions-label-merge-conflict@v2.1.0
uses: eps1lon/actions-label-merge-conflict@v3.0.0
with:
dirtyLabel: "Merge Conflict"
repoToken: "${{ secrets.GITHUB_TOKEN }}"

2
src/bash_functions.sh
View File

@ -65,7 +65,7 @@ ensure_basic_configuration() {
if [[ $(getFTLConfigValue "dns.upstreams") == "[]" ]]; then
echo ""
echo " [X] No DNS upstream servers are set!"
echo " [i] Recommended: Set the upstream DNS servers in the environment variable FTLCONF_dns_upstream"
echo " [i] Recommended: Set the upstream DNS servers in the environment variable FTLCONF_dns_upstreams"
echo ""
exit 1
fi