From 90cd9b2c1ddefffa6a02addbc24718fd2e9bf3d7 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 16 Sep 2019 17:18:17 +0200 Subject: docker-compose: Align hosts with hostname When using Docker CE 19.x, `hostname -d` fails to properly resolve the domainname due to changes in the way Docker sets it inside the container. Work around this issue by aligning the contents of `/etc/hostname` with `/etc/hosts`, so `hostname -d` can properly determine the domain name. This also requires calling `hostname -b` via cfg01 entrypoint.sh. Change-Id: I697b5d9882e3d6641712a00bca10012800ee1898 Signed-off-by: Alexandru Avadanii --- mcp/scripts/docker-compose/files/entrypoint.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mcp/scripts/docker-compose/files/entrypoint.sh') diff --git a/mcp/scripts/docker-compose/files/entrypoint.sh b/mcp/scripts/docker-compose/files/entrypoint.sh index b50dd2761..caa50a998 100755 --- a/mcp/scripts/docker-compose/files/entrypoint.sh +++ b/mcp/scripts/docker-compose/files/entrypoint.sh @@ -89,6 +89,11 @@ find -L /srv/salt /srv/salt/env/prd/_* -maxdepth 1 -type l -delete # Fix up any permissions after above file shuffling chown root:root -R /srv/salt +# Docker-ce 19.x+ workaround for broken domainname setup +# shellcheck source=/dev/null +source /root/fuel/mcp/scripts/xdf_data.sh +hostname -b "cfg01.${CLUSTER_DOMAIN}" + service ssh start service salt-minion start -- cgit 1.2.3-korg