mirror of
				https://github.com/willfarrell/docker-crontab.git
				synced 2025-10-30 21:27:18 +01:00 
			
		
		
		
	chore: whitespace and dead code cleanup.
This commit is contained in:
		| @@ -5,7 +5,7 @@ if [ -z "$DOCKER_HOST" ] && [ -a "$DOCKER_PORT_2375_TCP" ]; then | |||||||
| 	export DOCKER_HOST='tcp://docker:2375' | 	export DOCKER_HOST='tcp://docker:2375' | ||||||
| fi | fi | ||||||
|  |  | ||||||
| # for local testing only | # For local testing only. | ||||||
| #HOME_DIR=. | #HOME_DIR=. | ||||||
|  |  | ||||||
| if [ "${LOG_FILE}" == "" ]; then | if [ "${LOG_FILE}" == "" ]; then | ||||||
| @@ -32,25 +32,25 @@ get_config() { | |||||||
| DOCKER_SOCK=/var/run/docker.sock | DOCKER_SOCK=/var/run/docker.sock | ||||||
| CRONTAB_FILE=/etc/crontabs/docker | 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 | mkdir -p "${HOME_DIR}"/jobs "${HOME_DIR}"/projects | ||||||
|  |  | ||||||
| ensure_docker_socket_accessible() { | ensure_docker_socket_accessible() { | ||||||
|     if ! grep -q "^docker:" /etc/group; then |     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}) |         DOCKER_GID=$(stat -c '%g' ${DOCKER_SOCK}) | ||||||
|         if [ "${DOCKER_GID}" != "0" ]; then |         if [ "${DOCKER_GID}" != "0" ]; then | ||||||
|             if ! grep -qE "^[^:]+:[^:]+:${DOCKER_GID}:" /etc/group; 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 |                 addgroup -g "${DOCKER_GID}" docker | ||||||
|                 adduser docker docker |                 adduser docker docker | ||||||
|             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. | ||||||
|             adduser docker root |             adduser docker root | ||||||
|         fi |         fi | ||||||
|     fi |     fi | ||||||
| @@ -65,12 +65,9 @@ make_image_cmd() { | |||||||
|     VOLUMES=$(echo "${1}" | jq -r '.volumes | map(" -v " + .) | join("")') |     VOLUMES=$(echo "${1}" | jq -r '.volumes | map(" -v " + .) | join("")') | ||||||
|     PORTS=$(echo "${1}" | jq -r '.ports | map(" -p " + .) | join("")') |     PORTS=$(echo "${1}" | jq -r '.ports | map(" -p " + .) | join("")') | ||||||
|     EXPOSE=$(echo "${1}" | jq -r '.expose | map(" --expose " + .) | 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') |     NAME=$(echo "${1}" | jq -r 'select(.name != null) | .name') | ||||||
|     NETWORK=$(echo "${1}" | jq -r 'select(.network != null) | .network') |     NETWORK=$(echo "${1}" | jq -r 'select(.network != null) | .network') | ||||||
|     ENVIRONMENT=$(echo "${1}" | jq -r '.environment | map(" -e " + .) | join("")') |     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 [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi | ||||||
|     if [ -n "${NAME}" ]; then DOCKERARGS="${DOCKERARGS} --rm --name ${NAME} "; fi |     if [ -n "${NAME}" ]; then DOCKERARGS="${DOCKERARGS} --rm --name ${NAME} "; fi | ||||||
|     if [ -n "${NETWORK}" ]; then DOCKERARGS="${DOCKERARGS} --network ${NETWORK} "; fi |     if [ -n "${NETWORK}" ]; then DOCKERARGS="${DOCKERARGS} --network ${NETWORK} "; fi | ||||||
| @@ -93,8 +90,7 @@ make_container_cmd() { | |||||||
|     TMP_COMMAND=$(echo "${1}" | jq -r .command) |     TMP_COMMAND=$(echo "${1}" | jq -r .command) | ||||||
|  |  | ||||||
|     if [ "${PROJECT}" != "null" ]; then |     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 |         if [ "${SCRIPT_NAME}" == "null" ]; then | ||||||
|             SCRIPT_NAME=$(cat /proc/sys/kernel/random/uuid) |             SCRIPT_NAME=$(cat /proc/sys/kernel/random/uuid) | ||||||
|         fi |         fi | ||||||
| @@ -108,7 +104,6 @@ for CONTAINER_NAME in \$CONTAINERS; do | |||||||
| done | done | ||||||
| EOF | EOF | ||||||
|         echo "/bin/bash ${HOME_DIR}/projects/${SCRIPT_NAME}.sh" |         echo "/bin/bash ${HOME_DIR}/projects/${SCRIPT_NAME}.sh" | ||||||
|         # cat "/bin/bash ${HOME_DIR}/projects/${SCRIPT_NAME}.sh" |  | ||||||
|     else |     else | ||||||
|         echo "docker exec ${DOCKERARGS} ${CONTAINER} ${TMP_COMMAND}" |         echo "docker exec ${DOCKERARGS} ${CONTAINER} ${TMP_COMMAND}" | ||||||
|     fi |     fi | ||||||
| @@ -182,7 +177,6 @@ parse_schedule() { | |||||||
| } | } | ||||||
|  |  | ||||||
| function build_crontab() { | function build_crontab() { | ||||||
|          |  | ||||||
|     rm -rf ${CRONTAB_FILE} |     rm -rf ${CRONTAB_FILE} | ||||||
|  |  | ||||||
|     ONSTART=() |     ONSTART=() | ||||||
| @@ -216,28 +210,17 @@ cat << EOF > "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh | |||||||
| #!/usr/bin/env bash | #!/usr/bin/env bash | ||||||
| set -e | 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}" | echo "Start Cronjob **${SCRIPT_NAME}** ${COMMENT}" | ||||||
|  |  | ||||||
| $(make_cmd "$(jq -c .["$i"] "${CONFIG}")") | $(make_cmd "$(jq -c .["$i"] "${CONFIG}")") | ||||||
| EOF | EOF | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|         if [ "$(jq -r .["$i"].trigger "${CONFIG}")" != "null" ]; then |         if [ "$(jq -r .["$i"].trigger "${CONFIG}")" != "null" ]; then | ||||||
|             while read -r j ; do |             while read -r j ; do | ||||||
|                 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 | ||||||
|                 #TRIGGER_COMMAND=$(make_cmd "$(jq -c .[$i].trigger[$j] ${CONFIG})") |  | ||||||
|                 make_cmd "$(jq -c .["$i"].trigger["$j"] "${CONFIG}")" >> "${HOME_DIR}"/jobs/"${SCRIPT_NAME}".sh |                 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}") |             done < <(jq -r '.['"$i"'].trigger|keys[]' "${CONFIG}") | ||||||
|         fi |         fi | ||||||
|  |  | ||||||
| @@ -260,7 +243,6 @@ EOF | |||||||
|     done |     done | ||||||
| } | } | ||||||
|  |  | ||||||
|  |  | ||||||
| ensure_docker_socket_accessible | ensure_docker_socket_accessible | ||||||
|  |  | ||||||
| start_app() { | start_app() { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user