github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81 from ijc/no-default-hostname

Browse Source 
Do not force default hostname `moby`.
This commit is contained in:
Justin Cormack 2017-06-13 17:42:18 +02:00 committed by GitHub
commit d534273407
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/moby/image.go
View File

@ -23,11 +23,12 @@ type tarWriter interface {
// cache as it would be much simpler. // cache as it would be much simpler.
var exclude = map[string]bool{ var exclude = map[string]bool{
".dockerenv": true, ".dockerenv": true,
"Dockerfile": true, "Dockerfile": true,
"dev/console": true, "dev/console": true,
"dev/pts": true, "dev/pts": true,
"dev/shm": true, "dev/shm": true,
"etc/hostname": true,
} }
var replace = map[string]string{ var replace = map[string]string{
@ -43,7 +44,6 @@ nameserver 8.8.4.4
nameserver 2001:4860:4860::8888 nameserver 2001:4860:4860::8888
nameserver 2001:4860:4860::8844 nameserver 2001:4860:4860::8844
`, `,
"etc/hostname": "moby",
} }
// tarPrefix creates the leading directories for a path // tarPrefix creates the leading directories for a path