Remove trailing dot from FQDN

As it is described in #2140, the trailing dot might appear
when starting a container via "weave run".
This commit is contained in:
Martynas Pumputis committed 2016-04-11 11:17:36 +01:00
1 parent 28e0b14220
commit a4062bd15c
2 files changed
+3 -2

No files matched your search

+2 -1
View File
@@ -8,7 +8,8 @@ HOSTNAME=$NAME-hostname.$DOMAIN
# Docker inspect hostname + domainname of container $2 on host $1
docker_inspect_fqdn() {
docker_on $1 inspect --format='{{.Config.Hostname}}.{{.Config.Domainname}}' $2
FQDN=$(docker_on $1 inspect --format='{{.Config.Hostname}}.{{.Config.Domainname}}' $2)
echo ${FQDN%.}
}
# Start container with args $2.. and assert fqdn of $1
+1 -1
View File
@@ -1150,7 +1150,7 @@ etc_hosts_contents() {
shift
NAME=${FQDN%%.*}
HOSTNAMES="$NAME"
[ "$NAME" = "$FQDN" -o "$NAME." = "$FQDN" ] || HOSTNAMES="$FQDN $HOSTNAMES"
[ "$NAME" = "$FQDN" -o "$NAME." = "$FQDN" ] || HOSTNAMES="${FQDN%.} $HOSTNAMES"
echo "# created by Weave - BEGIN"
echo "# container hostname"