diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-28 18:11:20 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-12-03 13:45:44 +0000 |
| commit | c83587638ca4b7885bd002f0f6ddddd1f18d9a04 (patch) | |
| tree | b028707766353b6ec0f434683e4d2fed4e3a177d /mcp/scripts/lib_jump_common.sh | |
| parent | b5cad334243a0e258ba01d83c6884daee92503f5 (diff) | |
[docker] compose: Switch ip_range to ipv4_address
Explicitly set the ipv4_address for each network instead of relying
on ip_range allocation, which seems to fail / not be picked up.
While at it, use docker-compose 1.22 or newer to bypass slow Docker
network creation with 'macvlan' driver [1].
[1] https://github.com/docker/compose/issues/5248
Change-Id: Ic31851522576ebb2407d869b7c3ed7bd06951922
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 904183e275ca6b2aa6cad11a330fc060d5379b3e)
Diffstat (limited to 'mcp/scripts/lib_jump_common.sh')
| -rw-r--r-- | mcp/scripts/lib_jump_common.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mcp/scripts/lib_jump_common.sh b/mcp/scripts/lib_jump_common.sh index 02ada44e9..5b09c29ab 100644 --- a/mcp/scripts/lib_jump_common.sh +++ b/mcp/scripts/lib_jump_common.sh @@ -114,7 +114,9 @@ function docker_install { fi fi # Distro-provided docker-compose might be simply broken (Ubuntu 16.04, CentOS 7) - if ! docker-compose --version > /dev/null 2>&1; then + if ! docker-compose --version > /dev/null 2>&1 || \ + [ "$(docker-compose version --short | tr -d '.')" -lt 1220 ] && \ + [ "$(uname -m)" = 'x86_64' ]; then COMPOSE_BIN="${image_dir}/docker-compose" COMPOSE_VERSION='1.22.0' notify_n "[WARN] Using docker-compose ${COMPOSE_VERSION} in ${COMPOSE_BIN}" 3 |