Merge branch '1.4'

This commit is contained in:
Matthias Radestock committed 2016-04-11 15:40:32 +01:00
commit 4037c763c2
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