From a004f85145743b2a546f32ee5495d67318d8957c Mon Sep 17 00:00:00 2001
From: Jason Kulatunga <jason@thesparktree.com>
Date: Thu, 12 May 2022 15:24:51 -0700
Subject: [PATCH] fixing cron.

related #121
---
 docker/entrypoint-collector.sh   | 4 ++++
 rootfs/etc/cont-init.d/50-config | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/docker/entrypoint-collector.sh b/docker/entrypoint-collector.sh
index c65349a..97a6eda 100755
--- a/docker/entrypoint-collector.sh
+++ b/docker/entrypoint-collector.sh
@@ -7,6 +7,10 @@ printenv | sed 's/^\(.*\)$/export \1/g' > /env.sh
 
 # adding ability to customize the cron schedule.
 COLLECTOR_CRON_SCHEDULE=${COLLECTOR_CRON_SCHEDULE:-"0 0 * * *"}
+
+# if the cron schedule has been overridden via env variable (eg docker-compose) we should make sure to strip quotes
+[[ "${COLLECTOR_CRON_SCHEDULE}" == \"*\" || "${COLLECTOR_CRON_SCHEDULE}" == \'*\' ]] && COLLECTOR_CRON_SCHEDULE="${COLLECTOR_CRON_SCHEDULE:1:-1}"
+
 sed -i 's|{COLLECTOR_CRON_SCHEDULE}|'"${COLLECTOR_CRON_SCHEDULE}"'|g' /etc/cron.d/scrutiny
 
 # now that we have the env start cron in the foreground
diff --git a/rootfs/etc/cont-init.d/50-config b/rootfs/etc/cont-init.d/50-config
index 8ff0d45..53fd249 100644
--- a/rootfs/etc/cont-init.d/50-config
+++ b/rootfs/etc/cont-init.d/50-config
@@ -1,4 +1,9 @@
 #!/usr/bin/with-contenv bash
 
 COLLECTOR_CRON_SCHEDULE=${COLLECTOR_CRON_SCHEDULE:-"0 0 * * *"}
+
+# if the cron schedule has been overridden via env variable (eg docker-compose) we should make sure to strip quotes
+[[ "${COLLECTOR_CRON_SCHEDULE}" == \"*\" || "${COLLECTOR_CRON_SCHEDULE}" == \'*\' ]] && COLLECTOR_CRON_SCHEDULE="${COLLECTOR_CRON_SCHEDULE:1:-1}"
+
+# replace placeholder with correct value
 sed -i 's|{COLLECTOR_CRON_SCHEDULE}|'"${COLLECTOR_CRON_SCHEDULE}"'|g' /etc/cron.d/scrutiny
\ No newline at end of file