Ignore sockets when creating a tar stream of a layer

Ian Campbell · Ian Campbell · commit 2ec3382d2d6d · 2018-03-22T15:19:35.000Z
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
@@ -465,7 +465,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
`@@ -465,7 +465,10 @@ func (cw *changeWriter) HandleChange(k fs.ChangeKind, p string, f os.FileInfo, e`
`465`	`465`	`source = filepath.Join(cw.source, p)`
`466`	`466`	`)`
`467`	`467`
`468`		`- if f.Mode()&os.ModeSymlink != 0 {`
	`468`	`+ switch {`
	`469`	`+ case f.Mode()&os.ModeSocket != 0:`
	`470`	`+ return nil // ignore sockets`
	`471`	`+ case f.Mode()&os.ModeSymlink != 0:`
`469`	`472`	`if link, err = os.Readlink(source); err != nil {`
`470`	`473`	`return err`
`471`	`474`	`}`