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: whitespace and dead code cleanup.

Browse Source
This commit is contained in:
Robert Wlodarczyk
2022-07-16 08:31:20 -07:00
parent f18275eb0d
commit 99aa59ddb4
1 changed files with 7 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
docker-entrypoint
View File

@@ -5,7 +5,7 @@ if [ -z "$DOCKER_HOST" ] && [ -a "$DOCKER_PORT_2375_TCP" ]; then
export DOCKER_HOST='tcp://docker:2375'
fi
# for local testing only
# For local testing only.
#HOME_DIR=.
if [ "${LOG_FILE}" == "" ]; then
@@ -32,25 +32,25 @@ get_config() {
DOCKER_SOCK=/var/run/docker.sock
CRONTAB_FILE=/etc/crontabs/docker
# Ensure dir exist - in case of volume mapping
# Ensure dir exist - in case of volume mapping.
mkdir -p "${HOME_DIR}"/jobs "${HOME_DIR}"/projects
ensure_docker_socket_accessible() {
if ! grep -q "^docker:" /etc/group; then
# Ensure 'docker' user has permissions for docker socket (without changing permissions)
# Ensure 'docker' user has permissions for docker socket (without changing permissions).
DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK})
if [ "${DOCKER_GID}" != "0" ]; then
if ! grep -qE "^[^:]+:[^:]+:${DOCKER_GID}:" /etc/group; then
# No group with such gid exists - create group docker
# No group with such gid exists - create group docker.
addgroup -g "${DOCKER_GID}" docker
adduser docker docker
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 }}')
adduser docker "$DOCKER_GROUP_NAME"
fi
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.
adduser docker root
fi
fi
@@ -65,12 +65,9 @@ make_image_cmd() {
VOLUMES=$(echo "${1}" | jq -r '.volumes | map(" -v " + .) | join("")')
PORTS=$(echo "${1}" | jq -r '.ports | map(" -p " + .) | join("")')
EXPOSE=$(echo "${1}" | jq -r '.expose | map(" --expose " + .) | join("")')
# We'll add name in, if it exists
NAME=$(echo "${1}" | jq -r 'select(.name != null) | .name')
NETWORK=$(echo "${1}" | jq -r 'select(.network != null) | .network')
ENVIRONMENT=$(echo "${1}" | jq -r '.environment | map(" -e " + .) | join("")')
# echo ${1} | jq -r '.environment | join("\n")' > ${PWD}/${NAME}.env
# ENVIRONMENT=" --env-file ${PWD}/${NAME}.env"
if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi
if [ -n "${NAME}" ]; then DOCKERARGS="${DOCKERARGS} --rm --name ${NAME} "; fi
if [ -n "${NETWORK}" ]; then DOCKERARGS="${DOCKERARGS} --network ${NETWORK} "; fi
@@ -93,8 +90,7 @@ make_container_cmd() {
TMP_COMMAND=$(echo "${1}" | jq -r .command)
if [ "${PROJECT}" != "null" ]; then
# create bash script to detect all running containers
# Create bash script to detect all running containers.
if [ "${SCRIPT_NAME}" == "null" ]; then
SCRIPT_NAME=$(cat /proc/sys/kernel/random/uuid)
fi
@@ -108,7 +104,6 @@ for CONTAINER_NAME in \$CONTAINERS; do
done
EOF
echo "/bin/bash ${HOME_DIR}/projects/${SCRIPT_NAME}.sh"
# cat "/bin/bash ${HOME_DIR}/projects/${SCRIPT_NAME}.sh"
else
echo "docker exec ${DOCKERARGS} ${CONTAINER} ${TMP_COMMAND}"
fi
@@ -182,7 +177,6 @@ parse_schedule() {
}
function build_crontab() {
rm -rf ${CRONTAB_FILE}
ONSTART=()
@@ -216,28 +210,17 @@ cat << EOF > "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh
#!/usr/bin/env bash
set -e
# TODO find workaround
# [error] write /dev/stdout: broken pipe <- when using docker commands
#UUID=\$(cat /proc/sys/kernel/random/uuid)
#exec > >(read message; echo "\${UUID} \$(date -Iseconds) [info] \$message" | tee -a ${LOG_FILE} )
#exec 2> >(read message; echo "\${UUID} \$(date -Iseconds) [error] \$message" | tee -a ${LOG_FILE} >&2)
echo "Start Cronjob **${SCRIPT_NAME}** ${COMMENT}"
$(make_cmd "$(jq -c .["$i"] "${CONFIG}")")
EOF
if [ "$(jq -r .["$i"].trigger "${CONFIG}")" != "null" ]; then
while read -r j ; do
if [ "$(jq .["$i"].trigger["$j"].command "${CONFIG}")" == "null" ]; then
echo "Command Missing: $(jq -r .["$i"].trigger["$j"].command "${CONFIG}")"
continue
fi
#TRIGGER_COMMAND=$(make_cmd "$(jq -c .[$i].trigger[$j] ${CONFIG})")
make_cmd "$(jq -c .["$i"].trigger["$j"] "${CONFIG}")" >> "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh
#COMMAND="${COMMAND} && ${TRIGGER_COMMAND}"
done < <(jq -r '.['"$i"'].trigger|keys[]' "${CONFIG}")
fi
@@ -260,7 +243,6 @@ EOF
done
}
ensure_docker_socket_accessible
start_app() {