Snck3rs/docker-crontab
Snck3rs/docker-crontab
1
0
Fork 0
mirror of https://github.com/willfarrell/docker-crontab.git synced 2025-04-04 14:05:11 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing entrypoint dealing with JSON mapping

Browse Source
This commit is contained in:
Omar Ahmad 2020-12-23 13:22:15 -05:00
parent 0ef54cc06b
commit 88bed2bc4a
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
config-samples/config.sample.mapping.json
View File

@ -1,48 +1,38 @@
[ {
{ "cron with triggered commands": {
"comment": "cron with triggered commands", "comment": "cron with triggered commands",
"schedule": "* * * * *", "schedule": "* * * * *",
"command": "echo hello", "command": "echo hello",
"project": "crontab", "project": "crontab",
"container": "myapp", "container": "myapp",
"trigger": [ "trigger": [{ "command": "echo world", "container": "crontab_myapp_1" }]
{
"command": "echo world",
"container": "crontab_myapp_1"
}
]
}, },
{ "map a volume": {
"comment": "map a volume", "comment": "map a volume",
"schedule": "* * * * *", "schedule": "* * * * *",
"dockerargs": "-d -v /tmp:/tmp", "dockerargs": "-d -v /tmp:/tmp",
"command": "echo new", "command": "echo new",
"image": "alpine:3.5" "image": "alpine:3.5"
}, },
{ "use an ENV from inside a container": {
"comment": "use an ENV from inside a container", "comment": "use an ENV from inside a container",
"schedule": "@hourly", "schedule": "@hourly",
"dockerargs": "-d -e FOO=BAR", "dockerargs": "-d -e FOO=BAR",
"command": "sh -c 'echo hourly ${FOO}'", "command": "sh -c 'echo hourly ${FOO}'",
"image": "alpine:3.5" "image": "alpine:3.5"
}, },
{ "trigger every 2 min": {
"comment": "trigger every 2 min", "comment": "trigger every 2 min",
"schedule": "@every 2m", "schedule": "@every 2m",
"command": "echo 2 minute", "command": "echo 2 minute",
"image": "alpine:3.5", "image": "alpine:3.5",
"trigger": [ "trigger": [{ "command": "echo world", "container": "crontab_myapp_1" }]
{
"command": "echo world",
"container": "crontab_myapp_1"
}
]
}, },
{ "null": {
"schedule": "*/5 * * * *", "schedule": "*/5 * * * *",
"command": "/usr/sbin/logrotate /etc/logrotate.conf" "command": "/usr/sbin/logrotate /etc/logrotate.conf"
}, },
{ "Regenerate Certificate then reload nginx": {
"comment": "Regenerate Certificate then reload nginx", "comment": "Regenerate Certificate then reload nginx",
"schedule": "43 6,18 * * *", "schedule": "43 6,18 * * *",
"command": "sh -c 'dehydrated --cron --out /etc/ssl --domain ${LE_DOMAIN} --challenge dns-01 --hook dehydrated-dns'", "command": "sh -c 'dehydrated --cron --out /etc/ssl --domain ${LE_DOMAIN} --challenge dns-01 --hook dehydrated-dns'",
@ -57,4 +47,4 @@
], ],
"onstart": true "onstart": true
} }
] }

10
docker-entrypoint
View File

@ -17,9 +17,7 @@ fi
get_config() { get_config() {
if [ -f "${HOME_DIR}/config.json" ]; then if [ -f "${HOME_DIR}/config.json" ]; then
cp ${HOME_DIR}/config.json ${HOME_DIR}/config.json.old jq 'map(.)' ${HOME_DIR}/config.json > ${HOME_DIR}/config.working.json
jq 'map(.)' ${HOME_DIR}/config.json.old > ${HOME_DIR}/config.json
rm ${HOME_DIR}/config.json.old
elif [ -f "${HOME_DIR}/config.toml" ]; then elif [ -f "${HOME_DIR}/config.toml" ]; then
rq -t <<< $(cat ${HOME_DIR}/config.toml) | jq 'map(.)' > ${HOME_DIR}/config.json rq -t <<< $(cat ${HOME_DIR}/config.toml) | jq 'map(.)' > ${HOME_DIR}/config.json
elif [ -f "${HOME_DIR}/config.yml" ]; then elif [ -f "${HOME_DIR}/config.yml" ]; then
@ -265,8 +263,10 @@ ensure_docker_socket_accessible
start_app() { start_app() {
get_config get_config
if [ -f "${HOME_DIR}/config.json" ]; then if [ -f "${HOME_DIR}/config.working.json" ]; then
export CONFIG=${HOME_DIR}/config.json export CONFIG=${HOME_DIR}/config.working.json
elif [ -f "${HOME_DIR}/config.json" ]; then
export CONFIG=${HOME_DIR}/config.json
else else
echo "NO CONFIG FILE FOUND" echo "NO CONFIG FILE FOUND"
fi fi