From 35f15ee601ebf89b93d657a1b78fedb3a8ebbe38 Mon Sep 17 00:00:00 2001 From: Felipe Monteiro Date: Thu, 5 Apr 2018 14:55:19 -0400 Subject: [PATCH] [fix] Drop deckhand.conf from default DECKHAND_CONF_DIR path This drops deckhand.conf from default DECKHAND_CONF_DIR path so that: exec uwsgi \ ... --pyargv "--config-file ${DECKHAND_CONFIG_DIR}/deckhand.conf" \ ... Doesn't append deckhand.conf again, resulting in a broken path like: /etc/deckhand/deckhand.conf/deckhand.conf Change-Id: I1c9d5ad283fed7158ba70b84b5b4afb27a3ab5d9 --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index a39d73d1..8dd47d08 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -32,7 +32,7 @@ DECKHAND_API_WORKERS=${DECKHAND_API_WORKERS:-"1"} # Threads per worker DECKHAND_API_THREADS=${DECKHAND_API_THREADS:-"4"} # The Deckhand configuration directory containing deckhand.conf -DECKHAND_CONFIG_DIR=${DECKHAND_CONFIG_DIR:-"/etc/deckhand/deckhand.conf"} +DECKHAND_CONFIG_DIR=${DECKHAND_CONFIG_DIR:-"/etc/deckhand"} echo "Command: $1 with arguments $@" # Start deckhand application