-
-
Notifications
You must be signed in to change notification settings - Fork 83
move cron to os init, optimize cron init #285
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
aptalca
wants to merge
1
commit into
3.24
Choose a base branch
from
3.24-cron
base: 3.24
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,25 @@ | ||
| #!/usr/bin/with-contenv bash | ||
| # shellcheck shell=bash | ||
|
|
||
| # /defaults/crontabs is for user customizable crontabs and they take priority over /etc/crontabs | ||
| # /etc/crontabs is for non-user customizable crontabs | ||
| # /config/crontabs is only imported if /defaults/crontab is present in image | ||
| # in RO environments, no import is done, only /etc/crontabs is active | ||
| for cron_user in abc root; do | ||
| if [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then | ||
| if [[ -f "/etc/crontabs/${cron_user}" ]]; then | ||
| lsiown "${cron_user}":"${cron_user}" "/etc/crontabs/${cron_user}" | ||
| crontab -u "${cron_user}" "/etc/crontabs/${cron_user}" | ||
| fi | ||
| fi | ||
|
|
||
| if [[ -f "/defaults/crontabs/${cron_user}" ]]; then | ||
| if [[ -f "/defaults/crontabs/${cron_user}" ]] && [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then | ||
| # make folders | ||
| mkdir -p \ | ||
| /config/crontabs | ||
|
|
||
| # if crontabs do not exist in config | ||
| if [[ ! -f "/config/crontabs/${cron_user}" ]]; then | ||
| # copy crontab from system | ||
| if crontab -l -u "${cron_user}" >/dev/null 2>&1; then | ||
| crontab -l -u "${cron_user}" >"/config/crontabs/${cron_user}" | ||
| fi | ||
|
|
||
| # if crontabs still do not exist in config (were not copied from system) | ||
| # copy crontab from image defaults (using -n, do not overwrite an existing file) | ||
| cp -n "/defaults/crontabs/${cron_user}" /config/crontabs/ | ||
| fi | ||
|
|
||
| # set permissions and import user crontabs | ||
| lsiown "${cron_user}":"${cron_user}" "/config/crontabs/${cron_user}" | ||
| # import user crontabs | ||
| crontab -u "${cron_user}" "/config/crontabs/${cron_user}" | ||
|
|
||
| lsiown -R abc:abc /config/crontabs | ||
| fi | ||
| done | ||
File renamed without changes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was important. Having the cron user own the crontab in /config meant running as root inside the container required root access on the host. Having abc own the root crontab in /config will allow unprivileged users to modify the container's root cron. If the container has a docker socket that could lead to all kinds of shenanigans.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Most downstream images recursively chown config, no point in fighting it.
Custom init also had the same issue and the solution was to put them in a separate mount outside of config, which is not worth the hassle here.