From 07b5a195b4d334ceb7588d56a51890d17d80eda0 Mon Sep 17 00:00:00 2001 From: Kim Oliver Drechsel Date: Wed, 10 Aug 2022 00:41:26 +0200 Subject: [PATCH] Fix execution order in entrypoint.sh (#23) 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. --- manifest/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest/entrypoint.sh b/manifest/entrypoint.sh index b0931f3..1936770 100755 --- a/manifest/entrypoint.sh +++ b/manifest/entrypoint.sh @@ -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 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 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' @@ -39,3 +36,6 @@ else cat /var/log/nginx/dmarc-reports.log exit 1 fi + +# Start supervisord and services +/usr/bin/supervisord -n -c /etc/supervisord.conf