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

script cleanup

Browse Source
This commit is contained in:
will Farrell 2017-02-12 17:05:46 -07:00
parent e1a745ae15
commit 1c73fa9f91
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docker-entrypoint
View File

@ -9,19 +9,19 @@ DOCKER_SOCK=/var/run/docker.sock
CRONTAB_FILE=${HOME_DIR}/docker CRONTAB_FILE=${HOME_DIR}/docker
make_image_cmd() { make_image_cmd() {
DOCKERARGS=$(echo ${TMP_JSON} | jq -r .dockerargs) DOCKERARGS=$(echo ${1} | jq -r .dockerargs)
if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi
IMAGE=$(echo ${TMP_JSON} | jq -r .image) IMAGE=$(echo ${1} | jq -r .image)
TMP_COMMAND=$(echo ${TMP_JSON} | jq -r .command) TMP_COMMAND=$(echo ${1} | jq -r .command)
echo "docker run ${DOCKERARGS} ${IMAGE} ${TMP_COMMAND}" echo "docker run ${DOCKERARGS} ${IMAGE} ${TMP_COMMAND}"
} }
make_container_cmd() { make_container_cmd() {
DOCKERARGS=$(echo ${TMP_JSON} | jq -r .dockerargs) DOCKERARGS=$(echo ${1} | jq -r .dockerargs)
if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi
PROJECT=$(echo ${TMP_JSON} | jq -r .project) PROJECT=$(echo ${1} | jq -r .project)
CONTAINER=$(echo ${TMP_JSON} | jq -r .container) CONTAINER=$(echo ${1} | jq -r .container)
TMP_COMMAND=$(echo ${TMP_JSON} | jq -r .command) TMP_COMMAND=$(echo ${1} | jq -r .command)
COMMAND_ARR=() COMMAND_ARR=()
@ -47,8 +47,8 @@ EOF
} }
make_cmd() { make_cmd() {
IMAGE=$(echo ${TMP_JSON} | jq -r .image) IMAGE=$(echo ${1} | jq -r .image)
CONTAINER=$(echo ${TMP_JSON} | jq -r .container) CONTAINER=$(echo ${1} | jq -r .container)
if [ "${IMAGE}" != "null" ]; then if [ "${IMAGE}" != "null" ]; then
make_image_cmd make_image_cmd
elif [ "${CONTAINER}" != "null" ]; then elif [ "${CONTAINER}" != "null" ]; then
@ -110,7 +110,6 @@ parse_schedule() {
function build_crontab() { function build_crontab() {
rm -rf ${CRONTAB_FILE} rm -rf ${CRONTAB_FILE}
while read i ; do while read i ; do
#echo "parse $(jq .[$i] ${CONFIG})"
SCHEDULE=$(jq -r .[$i].schedule ${CONFIG} | sed 's/\*/\\*/g') SCHEDULE=$(jq -r .[$i].schedule ${CONFIG} | sed 's/\*/\\*/g')
if [ "${SCHEDULE}" == "null" ]; then if [ "${SCHEDULE}" == "null" ]; then
@ -124,17 +123,15 @@ function build_crontab() {
continue continue
fi fi
TMP_JSON=$(jq -c .[$i] ${CONFIG}) COMMAND=$(make_cmd "$(jq -c .[$i] ${CONFIG})")
COMMAND=$(make_cmd)
if [ "$(jq -r .[$i].trigger ${CONFIG})" != "null" ]; then if [ "$(jq -r .[$i].trigger ${CONFIG})" != "null" ]; then
while read j ; do while read j ; do
echo "trigger parse $(jq .[$i].trigger[$j] ${CONFIG})"
if [ "$(jq .[$i].trigger[$j].command ${CONFIG})" == "null" ]; then if [ "$(jq .[$i].trigger[$j].command ${CONFIG})" == "null" ]; then
echo "Command Missing: $(jq -r .[$i].trigger[$j].command ${CONFIG})" echo "Command Missing: $(jq -r .[$i].trigger[$j].command ${CONFIG})"
continue continue
fi fi
TMP_JSON=$(jq -c .[$i].trigger[$j] ${CONFIG}) TRIGGER_COMMANDS=$(make_cmd "$(jq -c .[$i].trigger[$j] ${CONFIG})")
COMMAND="$COMMAND && $(make_cmd)" COMMAND="${COMMAND} && ${TRIGGER_COMMANDS}"
done < <(jq -r '.['$i'].trigger|keys[]' ${CONFIG}) done < <(jq -r '.['$i'].trigger|keys[]' ${CONFIG})
fi fi
@ -153,9 +150,6 @@ function build_crontab() {
cat ${CRONTAB_FILE} cat ${CRONTAB_FILE}
} }
# Used to pass json to functions - total hack, I know
TMP_JSON=
if [ "$1" = "crond" ]; then if [ "$1" = "crond" ]; then
if [ -f ${CONFIG} ]; then if [ -f ${CONFIG} ]; then
build_crontab build_crontab