From 26739456e7ce45de1c03575fda5f09add009b347 Mon Sep 17 00:00:00 2001 From: David Ward Date: Fri, 22 Jan 2021 09:56:59 -0800 Subject: [PATCH] Add CRONTAB_PROJECT to environment - add environment substitution for the project field - add a CRONTAB_PROJECT environment variable to allow reference to the project that the crontab container is running in Related to https://github.com/willfarrell/docker-crontab/issues/38 --- docker-entrypoint | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-entrypoint b/docker-entrypoint index 2696ee5..1a0f1db 100755 --- a/docker-entrypoint +++ b/docker-entrypoint @@ -29,6 +29,9 @@ get_config() { DOCKER_SOCK=/var/run/docker.sock CRONTAB_FILE=/etc/crontabs/docker +if [ -z "$CRONTAB_PROJECT" ]; then + export CRONTAB_PROJECT=$(docker inspect -f '{{index .Config.Labels "com.docker.compose.project"}}' $HOSTNAME) +fi # Ensure dir exist - in case of volume mapping mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects @@ -86,7 +89,7 @@ make_container_cmd() { if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi SCRIPT_NAME=$(echo ${1} | jq -r .name) SCRIPT_NAME=$(slugify $SCRIPT_NAME) - PROJECT=$(echo ${1} | jq -r .project) + PROJECT=$(echo ${1} | jq -r .project | envsubst) CONTAINER=$(echo ${1} | jq -r .container | envsubst) TMP_COMMAND=$(echo ${1} | jq -r .command) @@ -180,7 +183,6 @@ parse_schedule() { } function build_crontab() { - rm -rf ${CRONTAB_FILE} ONSTART=()