Merge branch '1.4'

test/270_use_name_as_hostname_test.sh

@@ -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

weave

@@ -1211,7 +1211,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"