|
@ -652,9 +652,7 @@ array_pop() { |
|
|
export -f array_pop |
|
|
export -f array_pop |
|
|
|
|
|
|
|
|
array_member() { |
|
|
array_member() { |
|
|
local src elt |
|
|
|
|
|
src="$1" |
|
|
|
|
|
elt="$2" |
|
|
|
|
|
|
|
|
local src="$1" elt="$2" |
|
|
while read-0 key; do |
|
|
while read-0 key; do |
|
|
if [ "$(eval "echo -n \"\${$src[\$key]}\"")" == "$elt" ]; then |
|
|
if [ "$(eval "echo -n \"\${$src[\$key]}\"")" == "$elt" ]; then |
|
|
return 0 |
|
|
return 0 |
|
@ -2487,6 +2485,10 @@ export SERVICE_PACK="$services" |
|
|
case "$action" in |
|
|
case "$action" in |
|
|
up|start|stop|build) |
|
|
up|start|stop|build) |
|
|
master_services=$(get_master_services $SERVICE_PACK) || exit 1 |
|
|
master_services=$(get_master_services $SERVICE_PACK) || exit 1 |
|
|
|
|
|
if [[ "$action" == "up" ]] && ! array_member action_opts -d; then ## force daemon mode for up |
|
|
|
|
|
action_opts=("-d" "${action_opts[@]}") |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
launch_docker_compose "${compose_opts[@]}" "$action" "${action_opts[@]}" $master_services |
|
|
launch_docker_compose "${compose_opts[@]}" "$action" "${action_opts[@]}" $master_services |
|
|
;; |
|
|
;; |
|
|
run) |
|
|
run) |
|
|