Browse Source

chg: dev: ``get_docker_ip`` should give all IP and not filter only to temporary network

Indeed as the database container might already be launched on another
network before any script is launched. We can use this instance with
this modification.
raw-remaining-args
Valentin Lab 7 years ago
parent
commit
9db40baeab
  1. 7
      bin/compose

7
bin/compose

@ -562,11 +562,12 @@ _dcmd() {
db_docker_opts="$db_docker_opts -v $SERVER_ROOT_PREFIX$DB_PASSFILE:$DB_PASSFILE" db_docker_opts="$db_docker_opts -v $SERVER_ROOT_PREFIX$DB_PASSFILE:$DB_PASSFILE"
fi fi
## XXXX was here: actualy, we need only connection between this version and the client version
debug docker run -i --rm \ debug docker run -i --rm \
$db_docker_opts --network $_DB_NAME \
$db_docker_opts \
--entrypoint "$command" "$DOCKER_BASE_IMAGE" $db_cmd_opts "$@" --entrypoint "$command" "$DOCKER_BASE_IMAGE" $db_cmd_opts "$@"
docker run -i --rm \ docker run -i --rm \
$db_docker_opts --network $_DB_NAME \
$db_docker_opts \
--entrypoint "$command" "$DOCKER_BASE_IMAGE" $db_cmd_opts "$@" --entrypoint "$command" "$DOCKER_BASE_IMAGE" $db_cmd_opts "$@"
} }
export -f _dcmd export -f _dcmd
@ -605,7 +606,7 @@ export -f get_docker_ips
get_docker_ip() { get_docker_ip() {
local name="$1" local name="$1"
get_docker_ips "$name" | grep "^${_DB_NAME}:"
get_docker_ips "$name"
} }
export -f get_docker_ip export -f get_docker_ip

Loading…
Cancel
Save