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

chore: cleaning up echos.

Browse Source
This commit is contained in:
Robert Wlodarczyk 2022-07-16 10:53:34 -07:00
parent e69b276707
commit 31d0b732b2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker-entrypoint
View File

@ -16,7 +16,7 @@ fi
mkdir -p "${HOME_DIR}"/jobs "${HOME_DIR}"/projects mkdir -p "${HOME_DIR}"/jobs "${HOME_DIR}"/projects
if [ -z "${DOCKER_HOST}" ] && [ -a "${DOCKER_PORT_2375_TCP}" ]; then if [ -z "${DOCKER_HOST}" ] && [ -a "${DOCKER_PORT_2375_TCP}" ]; then
export DOCKER_HOST='tcp://docker:2375' export DOCKER_HOST="tcp://docker:2375"
fi fi
if [ "${LOG_FILE}" == "" ]; then if [ "${LOG_FILE}" == "" ]; then
@ -188,14 +188,14 @@ function build_crontab() {
while read -r i ; do while read -r i ; do
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
echo "Schedule Missing: $(jq -r .["$i"].schedule "${CONFIG}")" echo "'schedule' missing: $(jq -r .["$i"].schedule "${CONFIG}")"
continue continue
fi fi
SCHEDULE=$(parse_schedule "${SCHEDULE}" | sed 's/\\//g') SCHEDULE=$(parse_schedule "${SCHEDULE}" | sed 's/\\//g')
COMMAND=$(jq -r .["$i"].command "${CONFIG}") COMMAND=$(jq -r .["$i"].command "${CONFIG}")
if [ "${COMMAND}" == "null" ]; then if [ "${COMMAND}" == "null" ]; then
echo "Command Missing: '${COMMAND}'" echo "'command' missing: '${COMMAND}'"
continue continue
fi fi
@ -219,7 +219,7 @@ cat << EOF > "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
echo "Start Cronjob **${SCRIPT_NAME}**${COMMENT}" echo "start cron job **${SCRIPT_NAME}**${COMMENT}"
$(make_cmd "$(jq -c .["$i"] "${CONFIG}")") $(make_cmd "$(jq -c .["$i"] "${CONFIG}")")
EOF EOF
TRIGGER=$(jq -r .["$i"].trigger "${CONFIG}") TRIGGER=$(jq -r .["$i"].trigger "${CONFIG}")
@ -227,14 +227,14 @@ EOF
while read -r j ; do while read -r j ; do
TRIGGER_COMMAND=$(jq .["$i"].trigger["$j"].command "${CONFIG}") TRIGGER_COMMAND=$(jq .["$i"].trigger["$j"].command "${CONFIG}")
if [ "${TRIGGER_COMMAND}" == "null" ]; then if [ "${TRIGGER_COMMAND}" == "null" ]; then
echo "Command Missing: '${TRIGGER_COMMAND}'" echo "'command' missing: '${TRIGGER_COMMAND}'"
continue continue
fi fi
make_cmd "${TRIGGER_COMMAND}" >> "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh make_cmd "${TRIGGER_COMMAND}" >> "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh
done < <(jq -r '.['"$i"'].trigger|keys[]' "${CONFIG}") done < <(jq -r '.['"$i"'].trigger|keys[]' "${CONFIG}")
fi fi
echo "echo \"End Cronjob **${SCRIPT_NAME}**${COMMENT}\"" >> "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh echo "echo \"end cron job **${SCRIPT_NAME}**${COMMENT}\"" >> "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh
echo "${SCHEDULE} ${COMMAND}" >> ${CRONTAB_FILE} echo "${SCHEDULE} ${COMMAND}" >> ${CRONTAB_FILE}
@ -257,7 +257,7 @@ start_app() {
normalize_config normalize_config
export CONFIG=${HOME_DIR}/config.working.json export CONFIG=${HOME_DIR}/config.working.json
if [ ! -f "${CONFIG}" ]; then if [ ! -f "${CONFIG}" ]; then
echo "Unable to find ${CONFIG}." echo "generated ${CONFIG} missing."
exit 1 exit 1
fi fi
if [ "${1}" == "crond" ]; then if [ "${1}" == "crond" ]; then