From 5f5e97e516834e38f031160c455eef9b3a8b82b3 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Thu, 14 Sep 2017 16:26:14 +0200
Subject: [PATCH] better check of the crontabs and nginx as final command

---
 bin/docker-entrypoint.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 7f39bb6..201a0d5 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -166,11 +166,14 @@ email_cron_job() {
 
   mkdir -p $cron_task_dir
 
-  echo "* * * * * run-parts $cron_task_dir" >> $root_crontab
+  if ! grep $cron_task_dir $root_crontab > /dev/null; then
+    echo "* * * * * run-parts $cron_task_dir" >> $root_crontab
+  fi
   echo "#!/bin/sh" > $cron_task
   chmod +x $cron_task
   echo "su -c \"$process_email\" -ls /bin/bash nginx" >> $cron_task
 
+  crond -f -c /etc/crontabs &
 }
 
 
@@ -202,16 +205,13 @@ if [ ! -f $ssl_key ] && [ ! -L $ssl_key ] && \
   gen_ssl_cert
 fi
 
-if ! grep run-parts /etc/crontabs/root > /dev/null ; then
-  email_cron_job
-fi
-
 php_fpm_setup
 
 install
 
 php-fpm5
 
-nginx -g "pid /tmp/nginx.pid; daemon off;" &
+email_cron_job
+
+nginx -g "pid /tmp/nginx.pid; daemon off;"
 
-crond -f -c /etc/crontabs