From beb8d1230235ecfaeb694bac4eae78352d92412d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <40151420+ldericher@users.noreply.github.com> Date: Thu, 3 Mar 2022 00:25:45 +0100 Subject: [PATCH 1/3] README --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index fe0507d..46cc4c6 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,12 @@ Just drop your scripts into the relevant directory under `/kiwi-cron`, that's it You will likely want to automate some tasks regarding your `docker` infrastructure. That's why the `kiwi-cron` images package a current `docker-cli` – you can just mount your `docker.sock` in its containers and use `docker` commands normally. +## Time Zones + +`kiwi-cron` images include the `tzdata` package and automatically handle `/etc/localtime` on startup. By default, "Etc/UTC" is set as the container time zone. + +To use a different time zone, change the container environment variable `TZ` to your liking, e.g. "Europe/Berlin". + ## Simple jobs On startup, `kiwi-cron` checks for possible job files in the `/kiwi-cron` directory structure. @@ -21,27 +27,21 @@ On startup, `kiwi-cron` checks for possible job files in the `/kiwi-cron` direct For each subdirectory, a random valid cron schedule is generated, so that: - `/kiwi-cron/hourly` runs once every hour (random minute) -- `/kiwi-cron/daily` runs once every day (random nighttime value) +- `/kiwi-cron/daily` runs once every day (random nighttime value between 9 pm and 3 am) - `/kiwi-cron/weekly` runs once every weekend (random nighttime value on Saturday or Sunday) -- `/kiwi-cron/monthly` runs once every month (random nighttime value on a random day) -- `/kiwi-cron/yearly` and `/kiwi-cron/annually` runs once a year (random nighttime value on a random day in January or February) +- `/kiwi-cron/monthly` runs once every month (random nighttime value on a random day <= 28) +- `/kiwi-cron/yearly` and `/kiwi-cron/annually` runs once a year (random nighttime value on a random day <= 28 in January or February) Cron schedules are regenerated once on each startup, only for directories that have files. -## Time Zones - -`kiwi-cron` images include the `tzdata` package and automatically handle `/etc/localtime` on startup. By default, "Etc/UTC" is set as the container time zone. - -To use a different time zone, change the container environment variable `TZ` to your liking, e.g. "Europe/Berlin". - -## Finer granularity: The `/kiwi-cron/every` directory +## Granularity: The `/kiwi-cron/every` directory Directories like `/kiwi-cron/every/5_minutes` will run scripts every 5 minutes. `kiwi-cron` picks up on that format and generates valid `cron` schedules on startup. -You can define schedules to be run every N minutes, hours, days, or months by creating the corresponding directories. +This way, you can define schedules to be run every N minutes, hours, days, or months by creating the corresponding directories. -Scheduling for every N weeks (or years) doesn't work that way; jobs in those directories will instead be run every week (or every year). +Scheduling for every N weeks (or years) doesn't work though; jobs in those directories will instead be run every week (or every year). ## Inspection From e415d0b7e01e0ec806f37cfc11bd927341db41b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <40151420+ldericher@users.noreply.github.com> Date: Thu, 3 Mar 2022 00:26:36 +0100 Subject: [PATCH 2/3] bug: "7" included hour 3, i.e. times up until 3:59 am --- libexec/kiwi-cron/randomize_schedule | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/kiwi-cron/randomize_schedule b/libexec/kiwi-cron/randomize_schedule index c5e938a..e46eb93 100755 --- a/libexec/kiwi-cron/randomize_schedule +++ b/libexec/kiwi-cron/randomize_schedule @@ -8,7 +8,7 @@ read -r rs_minute rs_hour rs_day rs_month rs_weekday rs_command rs_minute=$(( RANDOM % 60 )) [ "${rs_hour}" = "R" ] && \ - rs_hour=$(( (21 + RANDOM % 7) % 24 )) # prefer nighttime + rs_hour=$(( (21 + RANDOM % 6) % 24 )) # prefer nighttime # rs_hour=$(( RANDOM % 24 )) # don't prefer nighttime [ "${rs_day}" = "R" ] && \ From ff334bc60322da243a2cae99ddaf0ba4c25483fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <40151420+ldericher@users.noreply.github.com> Date: Thu, 3 Mar 2022 00:26:50 +0100 Subject: [PATCH 3/3] cleanup --- libexec/kiwi-cron/create_schedule | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libexec/kiwi-cron/create_schedule b/libexec/kiwi-cron/create_schedule index 2d31a64..e92b2ca 100755 --- a/libexec/kiwi-cron/create_schedule +++ b/libexec/kiwi-cron/create_schedule @@ -5,29 +5,26 @@ cs_units="${2}" cs_command="${3}" if [ "${cs_every}" = "1" ]; then - cs_every="" + cs_every="*" else - cs_every="/${cs_every}" + cs_every="*/${cs_every}" fi -# generate valid random schedule values -# generally, "nighttime" and "weekend" will be preferred. - case "${cs_units}" in minute) - echo "*${cs_every} * * * * ${cs_command}" + echo "${cs_every} * * * * ${cs_command}" ;; hour) - echo "R *${cs_every} * * * ${cs_command}" + echo "R ${cs_every} * * * ${cs_command}" ;; day) - echo "R R *${cs_every} * * ${cs_command}" + echo "R R ${cs_every} * * ${cs_command}" ;; week) echo "R R * * R ${cs_command}" ;; month) - echo "R R R *${cs_every} * ${cs_command}" + echo "R R R ${cs_every} * ${cs_command}" ;; year) echo "R R R R * ${cs_command}"