gilles/scrutiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make 50-cron-config and entrypoint-collector.sh mirrors of each other. This is for ease of maintainability.

Browse Source 
related #121
This commit is contained in:
Jason Kulatunga
2022-05-14 22:04:46 -07:00
parent 0c908786e0
commit a35c3bae08
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/entrypoint-collector.sh
+4 -3
View File
@@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
# Cron runs in its own isolated environment (usually using only /etc/environment ) # Cron runs in its own isolated environment (usually using only /etc/environment )
# So when the container starts up, we will do a dump of the runtime environment into a .env file that we # So when the container starts up, we will do a dump of the runtime environment into a .env file that we
# will then source into the crontab file (/etc/cron.d/scrutiny.sh) # will then source into the crontab file (/etc/cron.d/scrutiny)
(set -o posix; export -p) > /env.sh
printenv | sed 's/^\(.*\)$/export \1/g' > /env.sh
# adding ability to customize the cron schedule. # adding ability to customize the cron schedule.
COLLECTOR_CRON_SCHEDULE=${COLLECTOR_CRON_SCHEDULE:-"0 0 * * *"} COLLECTOR_CRON_SCHEDULE=${COLLECTOR_CRON_SCHEDULE:-"0 0 * * *"}
@@ -11,6 +11,7 @@ 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 # 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}" [[ "${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 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 # now that we have the env start cron in the foreground
rootfs/etc/cont-init.d/50-config → rootfs/etc/cont-init.d/50-cron-config
+6
View File
@@ -1,5 +1,11 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# Cron runs in its own isolated environment (usually using only /etc/environment )
# So when the container starts up, we will do a dump of the runtime environment into a .env file that we
# will then source into the crontab file (/etc/cron.d/scrutiny)
(set -o posix; export -p) > /env.sh
# adding ability to customize the cron schedule.
COLLECTOR_CRON_SCHEDULE=${COLLECTOR_CRON_SCHEDULE:-"0 0 * * *"} 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 # if the cron schedule has been overridden via env variable (eg docker-compose) we should make sure to strip quotes
rootfs/etc/services.d/cron/run
-6
View File
@@ -1,10 +1,4 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# Cron runs in its own isolated environment (usually using only /etc/environment )
# So when the container starts up, we will do a dump of the runtime environment into a .env file that we
# will then source into the crontab file (/etc/cron.d/scrutiny.sh)
(set -o posix; export -p) > /env.sh
echo "starting cron" echo "starting cron"
cron -f -L 15 cron -f -L 15