From fdb12481002482d368e7897f80b52f0f28a6a0f2 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 15 Feb 2017 10:11:57 -0600
Subject: [PATCH] set cron job to run at random time between midnight and 4am

---
 Dockerfile           |  3 ---
 files/bin/startup.sh | 18 +++++++++++++++++-
 files/tier-crontab   |  2 --
 3 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 files/tier-crontab

diff --git a/Dockerfile b/Dockerfile
index c9c8c4f..028d63d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -96,9 +96,6 @@ ADD files/server.xml conf/server.xml
 
 ADD files/bin/setenv.sh /opt/tier/setenv.sh
 RUN chmod +x /opt/tier/setenv.sh
-ADD files/tier-crontab /opt/tier/tier-crontab
-RUN crontab /opt/tier/tier-crontab
-ADD files/tier-crontab /etc/cron.d/tier-crontab
 ADD files/bin/startup.sh /usr/bin/startup.sh
 RUN chmod +x /usr/bin/startup.sh
 ADD files/bin/sendtierbeacon.sh /usr/bin/sendtierbeacon.sh
diff --git a/files/bin/startup.sh b/files/bin/startup.sh
index 977adf3..37a317c 100644
--- a/files/bin/startup.sh
+++ b/files/bin/startup.sh
@@ -1,5 +1,21 @@
-#!/bin/sh
+#!/bin/bash
+#set env vars for cron job
 /opt/tier/setenv.sh
+
+#build crontab file with random start time between midnight and 3:59am
+echo "#send daily beacon to TIER Central" > /opt/tier/tier-cron
+echo "* * * * * /usr/bin/sendtierbeacon.sh >> /var/log/cron.log 2>&1" >> /opt/tier/tier-cron
+echo "#"$(expr $RANDOM % 59) $(expr $RANDOM % 3) "* * * /usr/bin/sendtierbeacon.sh >> /var/log/cron.log 2>&1" >> /opt/tier/tier-cron
+chmod 644 /opt/tier/tier-cron
+
+#install crontab
+crontab /opt/tier/tier-crontab
+
+#create cron logfile
 touch /var/log/cron.log
+
+#start crond
 /usr/sbin/crond
+
+#start tomcat
 /usr/local/tomcat/bin/catalina.sh run
diff --git a/files/tier-crontab b/files/tier-crontab
deleted file mode 100644
index 590dd74..0000000
--- a/files/tier-crontab
+++ /dev/null
@@ -1,2 +0,0 @@
-#send daily ping to TIER Central
-0 0 * * * /usr/bin/sendtierbeacon.sh >> /var/log/cron.log 2>&1