--- components/cli/vendor/github.com/docker/docker/pkg/archive/archive.go.orig	2019-04-10 23:47:39 UTC
+++ components/cli/vendor/github.com/docker/docker/pkg/archive/archive.go
@@ -362,7 +362,7 @@ func FileInfoHeader(name string, fi os.FileInfo, link 
 	if err != nil {
 		return nil, err
 	}
-	hdr.Format = tar.FormatPAX
+	hdr.Format = tar.FormatGNU
 	hdr.ModTime = hdr.ModTime.Truncate(time.Second)
 	hdr.AccessTime = time.Time{}
 	hdr.ChangeTime = time.Time{}
@@ -1155,7 +1155,7 @@ func (archiver *Archiver) CopyFileWithTar(src, dst str
 			if err != nil {
 				return err
 			}
-			hdr.Format = tar.FormatPAX
+			hdr.Format = tar.FormatGNU
 			hdr.ModTime = hdr.ModTime.Truncate(time.Second)
 			hdr.AccessTime = time.Time{}
 			hdr.ChangeTime = time.Time{}
--- components/cli/vendor/github.com/docker/docker/pkg/archive/copy.go.orig	2019-04-10 23:47:39 UTC
+++ components/cli/vendor/github.com/docker/docker/pkg/archive/copy.go
@@ -343,7 +343,7 @@ func RebaseArchiveEntries(srcContent io.Reader, oldBas
 			// "archive/tar: cannot encode header: Format specifies USTAR; and USTAR cannot encode Name=...".
 			//
 			// To fix, set the format to PAX here. See docker/for-linux issue #484.
-			hdr.Format = tar.FormatPAX
+			hdr.Format = tar.FormatGNU
 			hdr.Name = strings.Replace(hdr.Name, oldBase, newBase, 1)
 			if hdr.Typeflag == tar.TypeLink {
 				hdr.Linkname = strings.Replace(hdr.Linkname, oldBase, newBase, 1)