External/docker-dmarc-report
1
0
Fork 0
mirror of https://github.com/gutmensch/docker-dmarc-report.git synced 2025-12-17 17:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix execution order in entrypoint.sh (#23)

Browse Source 
I just checked my changes in PR #22 and I made a mistake in my commit yesterday that makes my code changes in the `entrypoint.sh` unreachable because supervisord is running in foreground mode.
It should be right before the line to start supervisord like in this PR.
Sorry for that.
This commit is contained in:
Kim Oliver Drechsel 2022-08-10 00:41:26 +02:00 committed by GitHub
parent da49afba3d
commit 07b5a195b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifest/entrypoint.sh
View File

@ -27,9 +27,6 @@ env | grep -e 'REPORT_DB_TYPE' -e 'REPORT_DB_HOST' -e 'REPORT_DB_PORT' -e 'REPOR
# compat from older image where variable was not existing # compat from older image where variable was not existing
grep -e ^REPORT_DB_PORT "$PHP_ENV_FILE" || echo env[REPORT_DB_PORT] = 3306 >> "$PHP_ENV_FILE" grep -e ^REPORT_DB_PORT "$PHP_ENV_FILE" || echo env[REPORT_DB_PORT] = 3306 >> "$PHP_ENV_FILE"
# Start supervisord and services
/usr/bin/supervisord -n -c /etc/supervisord.conf
# Get and parse dmarc reports once at startup to avoid PHP errors with a new database # Get and parse dmarc reports once at startup to avoid PHP errors with a new database
if /usr/bin/dmarcts-report-parser.pl -i -d -r > /var/log/nginx/dmarc-reports.log 2>&1; then if /usr/bin/dmarcts-report-parser.pl -i -d -r > /var/log/nginx/dmarc-reports.log 2>&1; then
echo 'INFO: Dmarc reports parsed successfully' echo 'INFO: Dmarc reports parsed successfully'
@ -39,3 +36,6 @@ else
cat /var/log/nginx/dmarc-reports.log cat /var/log/nginx/dmarc-reports.log
exit 1 exit 1
fi fi
# Start supervisord and services
/usr/bin/supervisord -n -c /etc/supervisord.conf