Browse Source

chg: catch empty ``docker-compose.conf`` with meaning-full error message.

raw-remaining-args
Valentin Lab 9 years ago
parent
commit
3fd2de482a
  1. 4
      bin/compose

4
bin/compose

@ -1544,6 +1544,10 @@ launch_docker_compose() {
_config_merge "$docker_compose_dir/docker-compose.yml" "$state_tmpdir/to-merge-in-docker-compose.yml" || return 1 _config_merge "$docker_compose_dir/docker-compose.yml" "$state_tmpdir/to-merge-in-docker-compose.yml" || return 1
fi fi
if [ -z "$(echo $(cat "$docker_compose_dir/docker-compose.yml"))" ]; then
die "Unexpected empty docker-compose."
fi
## XXXvlab: could be more specific and only link the needed charms ## XXXvlab: could be more specific and only link the needed charms
ln -sf "$CHARM_STORE/"* "$docker_compose_dir/" ln -sf "$CHARM_STORE/"* "$docker_compose_dir/"
mkdir "$docker_compose_dir/.data" mkdir "$docker_compose_dir/.data"

Loading…
Cancel
Save