github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 04:28:20 +00:00
Code Issues Projects Releases Wiki Activity

Use PAX tar format

Browse Source 
The default Go tar has restrictions on filename length for example.

PAX is recommended over GNU.

Requires Go 1.10

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2018-04-24 15:58:53 +01:00
parent 3a3a4560a3
commit d3a1de393f
No known key found for this signature in database
GPG Key ID: 609102888A2EE3F9
3 changed files with 65 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/moby/build.go
View File

@ -52,6 +52,7 @@ var additions = map[string]addFun{
Name: "Dockerfile", Name: "Dockerfile",
Mode: 0644, Mode: 0644,
Size: int64(len(dockerfile)), Size: int64(len(dockerfile)),
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -340,6 +341,7 @@ func (k *kernelFilter) WriteHeader(hdr *tar.Header) error {
Name: "boot", Name: "boot",
Mode: 0755, Mode: 0755,
Typeflag: tar.TypeDir, Typeflag: tar.TypeDir,
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(whdr); err != nil { if err := tw.WriteHeader(whdr); err != nil {
return err return err
@ -350,6 +352,7 @@ func (k *kernelFilter) WriteHeader(hdr *tar.Header) error {
Name: "boot/cmdline", Name: "boot/cmdline",
Mode: 0644, Mode: 0644,
Size: int64(len(k.cmdline)), Size: int64(len(k.cmdline)),
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(whdr); err != nil { if err := tw.WriteHeader(whdr); err != nil {
return err return err
@ -363,6 +366,7 @@ func (k *kernelFilter) WriteHeader(hdr *tar.Header) error {
Name: "boot/kernel", Name: "boot/kernel",
Mode: hdr.Mode, Mode: hdr.Mode,
Size: hdr.Size, Size: hdr.Size,
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(whdr); err != nil { if err := tw.WriteHeader(whdr); err != nil {
return err return err
@ -380,6 +384,7 @@ func (k *kernelFilter) WriteHeader(hdr *tar.Header) error {
Name: "boot", Name: "boot",
Mode: 0755, Mode: 0755,
Typeflag: tar.TypeDir, Typeflag: tar.TypeDir,
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(whdr); err != nil { if err := tw.WriteHeader(whdr); err != nil {
return err return err
@ -389,6 +394,7 @@ func (k *kernelFilter) WriteHeader(hdr *tar.Header) error {
Name: "boot/ucode.cpio", Name: "boot/ucode.cpio",
Mode: hdr.Mode, Mode: hdr.Mode,
Size: hdr.Size, Size: hdr.Size,
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(whdr); err != nil { if err := tw.WriteHeader(whdr); err != nil {
return err return err
@ -544,6 +550,7 @@ func filesystem(m Moby, tw *tar.Writer, idMap map[string]uint32) error {
Mode: dirMode, Mode: dirMode,
Uid: int(uid), Uid: int(uid),
Gid: int(gid), Gid: int(gid),
Format: tar.FormatPAX,
} }
err := tw.WriteHeader(hdr) err := tw.WriteHeader(hdr)
if err != nil { if err != nil {
@ -558,6 +565,7 @@ func filesystem(m Moby, tw *tar.Writer, idMap map[string]uint32) error {
Mode: mode, Mode: mode,
Uid: int(uid), Uid: int(uid),
Gid: int(gid), Gid: int(gid),
Format: tar.FormatPAX,
} }
if f.Directory { if f.Directory {
if f.Contents != nil { if f.Contents != nil {

6
src/moby/image.go
View File

@ -72,6 +72,7 @@ func tarPrefix(path string, tw tarWriter) error {
Name: mkdir, Name: mkdir,
Mode: 0755, Mode: 0755,
Typeflag: tar.TypeDir, Typeflag: tar.TypeDir,
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -220,6 +221,7 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt
Name: path.Join(prefix, "config.json"), Name: path.Join(prefix, "config.json"),
Mode: 0644, Mode: 0644,
Size: int64(len(config)), Size: int64(len(config)),
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -237,6 +239,7 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt
Name: tmp, Name: tmp,
Mode: 0755, Mode: 0755,
Typeflag: tar.TypeDir, Typeflag: tar.TypeDir,
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -246,6 +249,7 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt
Name: path.Join(prefix, "rootfs"), Name: path.Join(prefix, "rootfs"),
Mode: 0755, Mode: 0755,
Typeflag: tar.TypeDir, Typeflag: tar.TypeDir,
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -264,6 +268,7 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt
Name: path.Join(prefix, "rootfs"), Name: path.Join(prefix, "rootfs"),
Mode: 0755, Mode: 0755,
Typeflag: tar.TypeDir, Typeflag: tar.TypeDir,
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -289,6 +294,7 @@ func ImageBundle(prefix string, ref *reference.Spec, config []byte, runtime Runt
Name: path.Join(prefix, "runtime.json"), Name: path.Join(prefix, "runtime.json"),
Mode: 0644, Mode: 0644,
Size: int64(len(runtimeConfig)), Size: int64(len(runtimeConfig)),
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err

8
src/moby/output.go
View File

@ -276,6 +276,7 @@ func tarInitrdKernel(kernel, initrd []byte, cmdline string) (*bytes.Buffer, erro
Name: "kernel", Name: "kernel",
Mode: 0600, Mode: 0600,
Size: int64(len(kernel)), Size: int64(len(kernel)),
Format: tar.FormatPAX,
} }
err := tw.WriteHeader(hdr) err := tw.WriteHeader(hdr)
if err != nil { if err != nil {
@ -289,6 +290,7 @@ func tarInitrdKernel(kernel, initrd []byte, cmdline string) (*bytes.Buffer, erro
Name: "initrd.img", Name: "initrd.img",
Mode: 0600, Mode: 0600,
Size: int64(len(initrd)), Size: int64(len(initrd)),
Format: tar.FormatPAX,
} }
err = tw.WriteHeader(hdr) err = tw.WriteHeader(hdr)
if err != nil { if err != nil {
@ -302,6 +304,7 @@ func tarInitrdKernel(kernel, initrd []byte, cmdline string) (*bytes.Buffer, erro
Name: "cmdline", Name: "cmdline",
Mode: 0600, Mode: 0600,
Size: int64(len(cmdline)), Size: int64(len(cmdline)),
Format: tar.FormatPAX,
} }
err = tw.WriteHeader(hdr) err = tw.WriteHeader(hdr)
if err != nil { if err != nil {
@ -392,6 +395,7 @@ func outputKernelInitrdTarball(base string, kernel []byte, initrd []byte, cmdlin
Name: "kernel", Name: "kernel",
Mode: 0644, Mode: 0644,
Size: int64(len(kernel)), Size: int64(len(kernel)),
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -403,6 +407,7 @@ func outputKernelInitrdTarball(base string, kernel []byte, initrd []byte, cmdlin
Name: "initrd.img", Name: "initrd.img",
Mode: 0644, Mode: 0644,
Size: int64(len(initrd)), Size: int64(len(initrd)),
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -414,6 +419,7 @@ func outputKernelInitrdTarball(base string, kernel []byte, initrd []byte, cmdlin
Name: "cmdline", Name: "cmdline",
Mode: 0644, Mode: 0644,
Size: int64(len(cmdline)), Size: int64(len(cmdline)),
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -426,6 +432,7 @@ func outputKernelInitrdTarball(base string, kernel []byte, initrd []byte, cmdlin
Name: "ucode.cpio", Name: "ucode.cpio",
Mode: 0644, Mode: 0644,
Size: int64(len(ucode)), Size: int64(len(ucode)),
Format: tar.FormatPAX,
} }
if err := tw.WriteHeader(hdr); err != nil { if err := tw.WriteHeader(hdr); err != nil {
return err return err
@ -454,6 +461,7 @@ func outputKernelSquashFS(image, base string, filesystem io.Reader) error {
if err != nil { if err != nil {
return err return err
} }
thdr.Format = tar.FormatPAX
switch { switch {
case thdr.Name == "boot/kernel": case thdr.Name == "boot/kernel":
kernel, err := ioutil.ReadAll(tr) kernel, err := ioutil.ReadAll(tr)