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

Merge pull request #1927 from pi-hole/development

Browse Source 
development -> master for tagging
This commit is contained in:
Adam Warner
2025-10-26 20:18:19 +00:00
committed by GitHub
parent ad95d1cfdf 656877a0c8
commit 8756dfc34d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/editorconfig.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
- name: Get editorconfig-checker - name: Get editorconfig-checker
uses: editorconfig-checker/action-editorconfig-checker@4b6cd6190d435e7e084fb35e36a096e98506f7b9 # tag v2. is really out of date uses: editorconfig-checker/action-editorconfig-checker@4b6cd6190d435e7e084fb35e36a096e98506f7b9 #v2.1.0
- name: Run editorconfig-checker - name: Run editorconfig-checker
run: editorconfig-checker run: editorconfig-checker

16
src/start.sh
View File

@@ -70,18 +70,18 @@ start() {
# We need the PID of the capsh process so that we can wait for it to finish # We need the PID of the capsh process so that we can wait for it to finish
CAPSH_PID=$! CAPSH_PID=$!
# Get the FTL log file path from the config
FTLlogFile=$(getFTLConfigValue files.log.ftl)
# Wait until the log file exists before continuing # Wait until the log file exists before continuing
while [ ! -f /var/log/pihole/FTL.log ]; do while [ ! -f "${FTLlogFile}" ]; do
sleep 0.5 sleep 0.5
done done
# Wait until the FTL log contains the "FTL started" message before continuing, timeout after 10 seconds # Wait until the FTL log contains the "FTL started" message before continuing
# exit if we do not find it while ! grep -q '########## FTL started' "${FTLlogFile}"; do
pihole-FTL wait-for '########## FTL started' /var/log/pihole/FTL.log 10 0 > /dev/null sleep 0.5
if [ $? -ne 0 ]; then done
echo " [✗] FTL did not start - stopping container"
exit 1
fi
pihole updatechecker pihole updatechecker
local versionsOutput local versionsOutput