diff --git a/cmd/skopeo/inspect.go b/cmd/skopeo/inspect.go index f18a8ef2..2cd82203 100644 --- a/cmd/skopeo/inspect.go +++ b/cmd/skopeo/inspect.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "os" "strings" "text/tabwriter" "text/template" @@ -161,7 +160,7 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error) } else { row := "{{range . }}" + report.NormalizeFormat(opts.format) + "{{end}}" data = append(data, config) - err = printTmpl(row, data) + err = printTmpl(stdout, row, data) } if err != nil { return fmt.Errorf("Error writing OCI-formatted configuration data to standard output: %w", err) @@ -238,14 +237,14 @@ func (opts *inspectOptions) run(args []string, stdout io.Writer) (retErr error) } row := "{{range . }}" + report.NormalizeFormat(opts.format) + "{{end}}" data = append(data, outputData) - return printTmpl(row, data) + return printTmpl(stdout, row, data) } -func printTmpl(row string, data []interface{}) error { +func printTmpl(stdout io.Writer, row string, data []interface{}) error { t, err := template.New("skopeo inspect").Parse(row) if err != nil { return err } - w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0) + w := tabwriter.NewWriter(stdout, 8, 2, 2, ' ', 0) return t.Execute(w, data) } diff --git a/cmd/skopeo/sync.go b/cmd/skopeo/sync.go index e4a5277c..8afbdbc6 100644 --- a/cmd/skopeo/sync.go +++ b/cmd/skopeo/sync.go @@ -610,7 +610,7 @@ func (opts *syncOptions) run(args []string, stdout io.Writer) (retErr error) { SignPassphrase: passphrase, SignBySigstorePrivateKeyFile: opts.signBySigstorePrivateKey, SignSigstorePrivateKeyPassphrase: []byte(passphrase), - ReportWriter: os.Stdout, + ReportWriter: stdout, DestinationCtx: destinationCtx, ImageListSelection: imageListSelection, PreserveDigests: opts.preserveDigests,