From 3bcf1ca2cf5b0678f4a867845c119f2683f1c965 Mon Sep 17 00:00:00 2001
From: Dante Barba <dantebarba@Dantes-iMac.local>
Date: Thu, 17 Sep 2020 16:16:06 -0300
Subject: [PATCH] cron working

---
 Dockerfile | 14 ++------------
 cron.sh    | 13 ++++++-------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0d002c3..a8147df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,21 +11,11 @@ RUN apt-get update \
 ADD cron.sh /usr/bin/cron.sh
 RUN chmod +x /usr/bin/cron.sh
 
-ADD ./crontab /etc/cron.d/cron-jobs
-RUN chmod 0644 /etc/cron.d/cron-jobs
-
 RUN touch /var/log/autoremove-torrents.log
 
-RUN touch /var/log/cron.log
-
 COPY config.example.yml config.yml
 
-ENV OPTS ''
+ENV OPTS '-c /app/config.yml'
 ENV CRON '*/5 * * * *'
 
-ENTRYPOINT ["/bin/sh", "/usr/bin/cron.sh"]
-
-
-
-
-
+ENTRYPOINT ["/bin/sh", "/usr/bin/cron.sh"]
\ No newline at end of file
diff --git a/cron.sh b/cron.sh
index a4df011..91a887c 100644
--- a/cron.sh
+++ b/cron.sh
@@ -3,19 +3,18 @@
 if [ -z "$CRON" ]
   then
     echo "INFO: No CRON setting found. Running autoremove once."
-    /usr/bin/autoremove-torrents $OPTS
+    /usr/local/bin/autoremove-torrents $OPTS
   else
     # Setup cron schedule
-    crontab -d
-    echo "$CRON /usr/bin/autoremove-torrents $OPTS >> /var/log/autoremove-torrents.log 2>&1" > /tmp/crontab.tmp
+    echo "$CRON /usr/local/bin/autoremove-torrents $OPTS >> /var/log/autoremove-torrents.log 2>&1" > /tmp/crontab.tmp
     crontab /tmp/crontab.tmp
+    crontab -l
     rm /tmp/crontab.tmp
-
     # Start cron
-    echo "INFO: Starting crond ..."
+    echo "INFO: Starting cron ..."
     touch /var/log/crond.log
-    crond -b -l 0 -L /var/log/crond.log
-    echo "INFO: crond started"
+    cron -f &
+    echo "INFO: cron started"
     tail -F /var/log/crond.log /var/log/autoremove-torrents.log
   fi
 fi
\ No newline at end of file