Ignore sockets when creating a tar stream of a layer

Ian Campbell · dmcgowan · commit 6f0d28094bbe · 2018-03-22T14:18:11.000-07:00
The go-tar implementation which is used cannot handle sockets.

There's no good reason to preserve a socket, they are basically useless without
the process which made them.

Signed-off-by: Ian Campbell &lt;ian.campbell@docker.com&gt;
diff --git a/archive/tar.go b/archive/tar.go
@@ -345,7 +345,10 @@ func (cw *changeWriter) HandleChange(k fs.ChangeKind, p string, f os.FileInfo, e
 			source = filepath.Join(cw.source, p)
 		)
 
-		if f.Mode()&os.ModeSymlink != 0 {
+		switch {
+		case f.Mode()&os.ModeSocket != 0:
+			return nil // ignore sockets
+		case f.Mode()&os.ModeSymlink != 0:
 			if link, err = os.Readlink(source); err != nil {
 				return err
 			}

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,10 @@ func (cw *changeWriter) HandleChange(k fs.ChangeKind, p string, f os.FileInfo, e`
`345`	`345`	`source = filepath.Join(cw.source, p)`
`346`	`346`	`)`
`347`	`347`
`348`		`- if f.Mode()&os.ModeSymlink != 0 {`
	`348`	`+ switch {`
	`349`	`+ case f.Mode()&os.ModeSocket != 0:`
	`350`	`+ return nil // ignore sockets`
	`351`	`+ case f.Mode()&os.ModeSymlink != 0:`
`349`	`352`	`if link, err = os.Readlink(source); err != nil {`
`350`	`353`	`return err`
`351`	`354`	`}`