docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2486 from dongmx/issue2485 

issue #2485, In generic driver If a permanent IP address and hostname has alread in /etc/hosts
This commit is contained in:
David Gageot 2015-12-08 09:01:35 +01:00
parent 44d089a363 e799388e85
commit 6583e64e48
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libmachine/provision/generic.go
View File

@ -46,8 +46,15 @@ func (provisioner *GenericProvisioner) SetHostname(hostname string) error {
} }
// ubuntu/debian use 127.0.1.1 for non "localhost" loopback hostnames: https://www.debian.org/doc/manuals/debian-reference/ch05.en.html#_the_hostname_resolution // ubuntu/debian use 127.0.1.1 for non "localhost" loopback hostnames: https://www.debian.org/doc/manuals/debian-reference/ch05.en.html#_the_hostname_resolution
if _, err := provisioner.SSHCommand(fmt.Sprintf( if _, err := provisioner.SSHCommand(fmt.Sprintf(`
"if grep -xq 127.0.1.1.* /etc/hosts; then sudo sed -i 's/^127.0.1.1.*/127.0.1.1 %s/g' /etc/hosts; else echo '127.0.1.1 %s' | sudo tee -a /etc/hosts; fi", if ! grep -xq .*%s /etc/hosts; then
if grep -xq 127.0.1.1.* /etc/hosts; then
sudo sed -i 's/^127.0.1.1.*/127.0.1.1 %s/g' /etc/hosts;
else
echo '127.0.1.1 %s' | sudo tee -a /etc/hosts;
fi
fi`,
hostname,
hostname, hostname,
hostname, hostname,
)); err != nil { )); err != nil {