Browse Source

new: config file location have changed.

Still supporting hold locations.
raw-remaining-args
Valentin Lab 9 years ago
parent
commit
6b1bf0c108
  1. 7
      bin/compose

7
bin/compose

@ -2010,8 +2010,11 @@ if [ -z "$DISABLE_SYSTEM_CONFIG_FILE" ]; then
## XXXvlab: should provide YML config opportunities in possible parent dirs ? ## XXXvlab: should provide YML config opportunities in possible parent dirs ?
## userdir ? and global /etc/compose.yml ? ## userdir ? and global /etc/compose.yml ?
. /etc/compose.conf || exit 1
. /etc/compose.local.conf || exit 1
for cfgfile in /etc/compose.conf /etc/compose.local.conf \
/etc/default/compose /etc/compose/local.conf; do
[ -e "$cfgfile" ] || continue
. "$cfgfile" || die "Loading config file '$cfgfile' failed."
done
fi fi
_setup_state_dir _setup_state_dir

Loading…
Cancel
Save