airship
/
deckhand
Code Issues Proposed changes

[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
This commit is contained in:
Felipe Monteiro 2018-04-05 14:55:19 -04:00
parent 5f1fbbee3c
commit 35f15ee601
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entrypoint.sh
View File

@ -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