From dc18a5199df675bdcf9ee4644250320dfcd8c6e8 Mon Sep 17 00:00:00 2001 From: Robert Wlodarczyk Date: Sat, 16 Jul 2022 08:33:41 -0700 Subject: [PATCH] chore: reorganization. --- docker-entrypoint | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-entrypoint b/docker-entrypoint index 9f406c6..e9ece87 100755 --- a/docker-entrypoint +++ b/docker-entrypoint @@ -1,12 +1,19 @@ #!/usr/bin/env bash set -e +DOCKER_SOCK=/var/run/docker.sock +CRONTAB_FILE=/etc/crontabs/docker + +# For local testing only. +#HOME_DIR=. + +# Ensure dir exist - in case of volume mapping. +mkdir -p "${HOME_DIR}"/jobs "${HOME_DIR}"/projects + if [ -z "$DOCKER_HOST" ] && [ -a "$DOCKER_PORT_2375_TCP" ]; then export DOCKER_HOST='tcp://docker:2375' fi -# For local testing only. -#HOME_DIR=. if [ "${LOG_FILE}" == "" ]; then LOG_DIR=/var/log/crontab @@ -29,12 +36,6 @@ get_config() { jq 'map(.)' "${JSON_CONFIG}" > "${HOME_DIR}"/config.working.json } -DOCKER_SOCK=/var/run/docker.sock -CRONTAB_FILE=/etc/crontabs/docker - -# 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). @@ -243,8 +244,6 @@ EOF done } -ensure_docker_socket_accessible - start_app() { get_config export CONFIG=${HOME_DIR}/config.working.json @@ -259,4 +258,5 @@ start_app() { exec "$@" } +ensure_docker_socket_accessible start_app "$@"