Snck3rs/docker-crontab
1
0
Fork 0
mirror of https://github.com/willfarrell/docker-crontab.git synced 2025-10-31 05:37:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: simplifying logic.

Browse Source
This commit is contained in:
Robert Wlodarczyk
2022-07-16 08:28:20 -07:00
parent 882fb137f2
commit f18275eb0d
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
docker-entrypoint
View File

@@ -16,15 +16,17 @@ if [ "${LOG_FILE}" == "" ]; then
fi fi
get_config() { get_config() {
JSON_CONFIG={}
if [ -f "${HOME_DIR}/config.json" ]; then if [ -f "${HOME_DIR}/config.json" ]; then
jq 'map(.)' "${HOME_DIR}"/config.json > "${HOME_DIR}"/config.working.json JSON_CONFIG="$(cat "${HOME_DIR}"/config.json)"
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 JSON_CONFIG="$(rq -t <<< "$(cat "${HOME_DIR}"/config.toml)")"
elif [ -f "${HOME_DIR}/config.yml" ]; then elif [ -f "${HOME_DIR}/config.yml" ]; then
rq -y <<< "$(cat "${HOME_DIR}"/config.yml)" | jq 'map(.)' > "${HOME_DIR}"/config.json JSON_CONFIG="$(rq -y <<< "$(cat "${HOME_DIR}"/config.yml)")"
elif [ -f "${HOME_DIR}/config.yaml" ]; then elif [ -f "${HOME_DIR}/config.yaml" ]; then
rq -y <<< "$(cat "${HOME_DIR}"/config.yaml)" | jq 'map(.)' > "${HOME_DIR}"/config.json JSON_CONFIG="$(rq -y <<< "$(cat "${HOME_DIR}"/config.yaml)")"
fi fi
jq 'map(.)' "${JSON_CONFIG}" > "${HOME_DIR}"/config.working.json
} }
DOCKER_SOCK=/var/run/docker.sock DOCKER_SOCK=/var/run/docker.sock
@@ -263,19 +265,13 @@ ensure_docker_socket_accessible
start_app() { start_app() {
get_config get_config
if [ -f "${HOME_DIR}/config.working.json" ]; then
export CONFIG=${HOME_DIR}/config.working.json export CONFIG=${HOME_DIR}/config.working.json
elif [ -f "${HOME_DIR}/config.json" ]; then if [ ! -f "${CONFIG}" ]; then
export CONFIG=${HOME_DIR}/config.json echo "Unable to find ${CONFIG}."
else exit 1
echo "NO CONFIG FILE FOUND"
fi fi
if [ "$1" = "crond" ]; then if [ "$1" == "crond" ]; then
if [ -f "${CONFIG}" ]; then
build_crontab build_crontab
else
echo "Unable to find ${CONFIG}"
fi
fi fi
echo "$@" echo "$@"
exec "$@" exec "$@"