docker/buildx
1
0
Fork 0
mirror of https://github.com/docker/buildx.git synced 2024-11-22 15:37:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: support tar flag for oci+docker exporters

Browse Source 
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell 2022-11-22 14:42:39 +00:00
parent 36e663edda
commit e6b09580b4
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
util/buildflags/output.go
View File

@ -4,6 +4,7 @@ import (
"encoding/csv" "encoding/csv"
"io" "io"
"os" "os"
"strconv"
"strings" "strings"
"github.com/containerd/console" "github.com/containerd/console"
@ -62,25 +63,52 @@ func ParseOutputs(inp []string) ([]client.ExportEntry, error) {
return nil, errors.Errorf("type is required for output") return nil, errors.Errorf("type is required for output")
} }
// handle client side supportFile := false
supportDir := false
switch out.Type { switch out.Type {
case client.ExporterLocal: case client.ExporterLocal:
dest, ok := out.Attrs["dest"] supportDir = true
case client.ExporterTar:
supportFile = true
case client.ExporterOCI, client.ExporterDocker:
tar, err := strconv.ParseBool(out.Attrs["tar"])
if err != nil {
tar = true
}
supportFile = tar
supportDir = !tar
case "registry":
out.Type = client.ExporterImage
if _, ok := out.Attrs["push"]; !ok {
out.Attrs["push"] = "true"
}
}
dest, ok := out.Attrs["dest"]
if supportDir {
if !ok { if !ok {
return nil, errors.Errorf("dest is required for local output") return nil, errors.Errorf("dest is required for %s exporter", out.Type)
}
if dest == "-" {
return nil, errors.Errorf("dest cannot be stdout for %s exporter", out.Type)
}
fi, err := os.Stat(dest)
if err != nil && !os.IsNotExist(err) {
return nil, errors.Wrapf(err, "invalid destination directory: %s", dest)
}
if err == nil && !fi.IsDir() {
return nil, errors.Errorf("destination directory %s is a file", dest)
} }
out.OutputDir = dest out.OutputDir = dest
delete(out.Attrs, "dest") }
case client.ExporterOCI, client.ExporterDocker, client.ExporterTar: if supportFile {
dest, ok := out.Attrs["dest"] if !ok && out.Type != client.ExporterDocker {
if !ok { dest = "-"
if out.Type != client.ExporterDocker {
dest = "-"
}
} }
if dest == "-" { if dest == "-" {
if _, err := console.ConsoleFromFile(os.Stdout); err == nil { if _, err := console.ConsoleFromFile(os.Stdout); err == nil {
return nil, errors.Errorf("output file is required for %s exporter. refusing to write to console", out.Type) return nil, errors.Errorf("dest file is required for %s exporter. refusing to write to console", out.Type)
} }
out.Output = wrapWriteCloser(os.Stdout) out.Output = wrapWriteCloser(os.Stdout)
} else if dest != "" { } else if dest != "" {
@ -97,12 +125,9 @@ func ParseOutputs(inp []string) ([]client.ExportEntry, error) {
} }
out.Output = wrapWriteCloser(f) out.Output = wrapWriteCloser(f)
} }
}
if supportFile || supportDir {
delete(out.Attrs, "dest") delete(out.Attrs, "dest")
case "registry":
out.Type = client.ExporterImage
if _, ok := out.Attrs["push"]; !ok {
out.Attrs["push"] = "true"
}
} }
outs = append(outs, out) outs = append(outs, out)