Browse Source

chg: dev: minor comment addition, removal, and simplification. !minor

test
Valentin Lab 6 years ago
parent
commit
9f4cb01a36
  1. 9
      bin/compose

9
bin/compose

@ -2165,16 +2165,13 @@ launch_docker_compose() {
local charm docker_compose_tmpdir docker_compose_dir local charm docker_compose_tmpdir docker_compose_dir
docker_compose_tmpdir=$(mktemp -d -t tmp.XXXXXXXXXX) docker_compose_tmpdir=$(mktemp -d -t tmp.XXXXXXXXXX)
#debug "Creating temporary docker-compose directory in '$docker_compose_tmpdir'." #debug "Creating temporary docker-compose directory in '$docker_compose_tmpdir'."
# trap_add EXIT "debug \"Removing temporary docker-compose directory in $docker_compose_tmpdir.\";\
# rm -rf \"$docker_compose_tmpdir\""
trap_add EXIT "rm -rf \"$docker_compose_tmpdir\"" trap_add EXIT "rm -rf \"$docker_compose_tmpdir\""
## docker-compose will name network from the parent dir name
project=$(get_default_project_name) project=$(get_default_project_name)
mkdir -p "$docker_compose_tmpdir/$project" mkdir -p "$docker_compose_tmpdir/$project"
docker_compose_dir="$docker_compose_tmpdir/$project" docker_compose_dir="$docker_compose_tmpdir/$project"
# if [ -z "$SERVICE_PACK" ]; then
# export SERVICE_PACK=$(get_default_target_services $SERVICE_PACK)
# fi
get_docker_compose $SERVICE_PACK > "$docker_compose_dir/docker-compose.yml" || return 1 get_docker_compose $SERVICE_PACK > "$docker_compose_dir/docker-compose.yml" || return 1
if [ -e "$state_tmpdir/to-merge-in-docker-compose.yml" ]; then if [ -e "$state_tmpdir/to-merge-in-docker-compose.yml" ]; then
# debug "Merging some config data in docker-compose.yml:" # debug "Merging some config data in docker-compose.yml:"
@ -2199,7 +2196,7 @@ launch_docker_compose() {
{ {
cd "$docker_compose_dir" cd "$docker_compose_dir"
debug "${WHITE}docker-compose.yml$NORMAL for $DARKYELLOW$SERVICE_PACK$NORMAL:" debug "${WHITE}docker-compose.yml$NORMAL for $DARKYELLOW$SERVICE_PACK$NORMAL:"
debug "$(cat "$docker_compose_dir/docker-compose.yml" | prefix " $GRAY|$NORMAL ")"
debug "$(cat "docker-compose.yml" | prefix " $GRAY|$NORMAL ")"
debug "${WHITE}Launching$NORMAL: docker-compose $@" debug "${WHITE}Launching$NORMAL: docker-compose $@"
if [ "$DRY_COMPOSE_RUN" ]; then if [ "$DRY_COMPOSE_RUN" ]; then
echo docker-compose "$@" echo docker-compose "$@"

Loading…
Cancel
Save