Attachment #244637 for bug #273569

View | Details | Raw Unified | Return to bug 273569
Collapse All | Expand All

Lines 362-368 func FileInfoHeader(name string, fi os.FileInfo, link Link Here

(-)components/cli/vendor/github.com/docker/docker/pkg/archive/archive.go (-2 / +2 lines)
362	if err != nil {	362	if err != nil {
363	return nil, err	363	return nil, err
364	}	364	}
365	hdr.Format = tar.FormatPAX	365	hdr.Format = tar.FormatGNU
366	hdr.ModTime = hdr.ModTime.Truncate(time.Second)	366	hdr.ModTime = hdr.ModTime.Truncate(time.Second)
367	hdr.AccessTime = time.Time{}	367	hdr.AccessTime = time.Time{}
368	hdr.ChangeTime = time.Time{}	368	hdr.ChangeTime = time.Time{}
Lines 1155-1161 func (archiver *Archiver) CopyFileWithTar(src, dst str Link Here
1155	if err != nil {	1155	if err != nil {
1156	return err	1156	return err
1157	}	1157	}
1158	hdr.Format = tar.FormatPAX	1158	hdr.Format = tar.FormatGNU
1159	hdr.ModTime = hdr.ModTime.Truncate(time.Second)	1159	hdr.ModTime = hdr.ModTime.Truncate(time.Second)
1160	hdr.AccessTime = time.Time{}	1160	hdr.AccessTime = time.Time{}
1161	hdr.ChangeTime = time.Time{}	1161	hdr.ChangeTime = time.Time{}

Lines 343-349 func RebaseArchiveEntries(srcContent io.Reader, oldBas Link Here

(-)components/cli/vendor/github.com/docker/docker/pkg/archive/copy.go (-1 / +1 lines)
343	// "archive/tar: cannot encode header: Format specifies USTAR; and USTAR cannot encode Name=...".	343	// "archive/tar: cannot encode header: Format specifies USTAR; and USTAR cannot encode Name=...".
344	//	344	//
345	// To fix, set the format to PAX here. See docker/for-linux issue #484.	345	// To fix, set the format to PAX here. See docker/for-linux issue #484.
346	hdr.Format = tar.FormatPAX	346	hdr.Format = tar.FormatGNU
347	hdr.Name = strings.Replace(hdr.Name, oldBase, newBase, 1)	347	hdr.Name = strings.Replace(hdr.Name, oldBase, newBase, 1)
348	if hdr.Typeflag == tar.TypeLink {	348	if hdr.Typeflag == tar.TypeLink {
349	hdr.Linkname = strings.Replace(hdr.Linkname, oldBase, newBase, 1)	349	hdr.Linkname = strings.Replace(hdr.Linkname, oldBase, newBase, 1)

Return to bug 273569