Snck3rs/docker-crontab
1
0
Fork 0
mirror of https://github.com/willfarrell/docker-crontab.git synced 2025-10-30 21:27:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: standardize on {}.

Browse Source
This commit is contained in:
Robert Wlodarczyk
2022-07-16 08:43:14 -07:00
parent 84265413ee
commit f0c30632bd
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
docker-entrypoint
View File

@@ -15,7 +15,7 @@ fi
# Ensure dir exist - in case of volume mapping. # Ensure dir exist - in case of volume mapping.
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
@@ -53,7 +53,7 @@ ensure_docker_socket_accessible() {
else else
# Group with such gid exists - add user "docker" to this group. # Group with such gid exists - add user "docker" to this group.
DOCKER_GROUP_NAME=$(getent group "${DOCKER_GID}" | awk -F':' '{{ print $1 }}') DOCKER_GROUP_NAME=$(getent group "${DOCKER_GID}" | awk -F':' '{{ print $1 }}')
adduser docker "$DOCKER_GROUP_NAME" adduser docker "${DOCKER_GROUP_NAME}"
fi fi
else else
# Docker socket belongs to "root" group - add user "docker" to this group. # Docker socket belongs to "root" group - add user "docker" to this group.
@@ -63,7 +63,7 @@ ensure_docker_socket_accessible() {
} }
slugify() { slugify() {
echo "$@" | iconv -t ascii | sed -r s/[~^]+//g | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | tr '[:upper:]' '[:lower:]' echo "${@}" | iconv -t ascii | sed -r s/[~^]+//g | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | tr '[:upper:]' '[:lower:]'
} }
make_image_cmd() { make_image_cmd() {
@@ -90,7 +90,7 @@ make_container_cmd() {
DOCKERARGS=$(echo "${1}" | jq -r .dockerargs) DOCKERARGS=$(echo "${1}" | jq -r .dockerargs)
if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi
SCRIPT_NAME=$(echo "${1}" | jq -r .name) SCRIPT_NAME=$(echo "${1}" | jq -r .name)
SCRIPT_NAME=$(slugify "$SCRIPT_NAME") SCRIPT_NAME=$(slugify "${SCRIPT_NAME}")
PROJECT=$(echo "${1}" | jq -r .project) PROJECT=$(echo "${1}" | jq -r .project)
CONTAINER=$(echo "${1}" | jq -r .container | envsubst) CONTAINER=$(echo "${1}" | jq -r .container | envsubst)
TMP_COMMAND=$(echo "${1}" | jq -r .command) TMP_COMMAND=$(echo "${1}" | jq -r .command)
@@ -123,11 +123,11 @@ EOF
make_cmd() { make_cmd() {
if [ "$(echo "${1}" | jq -r .image)" != "null" ]; then if [ "$(echo "${1}" | jq -r .image)" != "null" ]; then
make_image_cmd "$1" make_image_cmd "${1}"
elif [ "$(echo "${1}" | jq -r .container)" != "null" ]; then elif [ "$(echo "${1}" | jq -r .container)" != "null" ]; then
make_container_cmd "$1" make_container_cmd "${1}"
#elif [ "$(echo ${1} | jq -r .host)" != "null" ]; then #elif [ "$(echo ${1} | jq -r .host)" != "null" ]; then
# make_host_cmd "$1" # make_host_cmd "${1}"
else else
echo "${1}" | jq -r .command echo "${1}" | jq -r .command
fi fi
@@ -160,9 +160,9 @@ parse_schedule() {
TIME=$2 TIME=$2
TOTAL=0 TOTAL=0
M=$(echo "$TIME" | grep -o '[0-9]\+m') M=$(echo "${TIME}" | grep -o '[0-9]\+m')
H=$(echo "$TIME" | grep -o '[0-9]\+h') H=$(echo "${TIME}" | grep -o '[0-9]\+h')
D=$(echo "$TIME" | grep -o '[0-9]\+d') D=$(echo "${TIME}" | grep -o '[0-9]\+d')
if [ -n "${M}" ]; then if [ -n "${M}" ]; then
TOTAL=$((TOTAL + ${M::-1})) TOTAL=$((TOTAL + ${M::-1}))
@@ -206,7 +206,7 @@ function build_crontab() {
fi fi
SCRIPT_NAME=$(jq -r .["$i"].name "${CONFIG}") SCRIPT_NAME=$(jq -r .["$i"].name "${CONFIG}")
SCRIPT_NAME=$(slugify "$SCRIPT_NAME") SCRIPT_NAME=$(slugify "${SCRIPT_NAME}")
if [ "${SCRIPT_NAME}" == "null" ]; then if [ "${SCRIPT_NAME}" == "null" ]; then
SCRIPT_NAME=$(cat /proc/sys/kernel/random/uuid) SCRIPT_NAME=$(cat /proc/sys/kernel/random/uuid)
fi fi
@@ -256,12 +256,12 @@ start_app() {
echo "Unable to find ${CONFIG}." echo "Unable to find ${CONFIG}."
exit 1 exit 1
fi fi
if [ "$1" == "crond" ]; then if [ "${1}" == "crond" ]; then
build_crontab build_crontab
fi fi
echo "$@" echo "${@}"
exec "$@" exec "${@}"
} }
ensure_docker_socket_accessible ensure_docker_socket_accessible
start_app "$@" start_app "${@}"