mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
6bc1f345af
Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com> Adds to history documentation for --format Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com> Adds MarshalJSON to historyContext for {{json .}} format Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com> Adds back the --human option to history command Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com> Cleans up formatter around --human option for history, Adds integration test for --format option of history Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com> Adds test for history formatter checking full table results, Runs go fmt on touched files Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com> Fixes lint errors in formatter/history Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com> Runs go fmt on cli/command/formatter/history.go Signed-off-by: Jeremy Chambers <jeremy@thehipbot.com> sRemoves integration test for --format option of history Merges Created and CreatedSince in docker history formatter, Updates docs and tests
113 lines
2.7 KiB
Go
113 lines
2.7 KiB
Go
package formatter
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types/image"
|
|
"github.com/docker/docker/pkg/stringid"
|
|
"github.com/docker/docker/pkg/stringutils"
|
|
units "github.com/docker/go-units"
|
|
)
|
|
|
|
const (
|
|
defaultHistoryTableFormat = "table {{.ID}}\t{{.CreatedSince}}\t{{.CreatedBy}}\t{{.Size}}\t{{.Comment}}"
|
|
nonHumanHistoryTableFormat = "table {{.ID}}\t{{.CreatedAt}}\t{{.CreatedBy}}\t{{.Size}}\t{{.Comment}}"
|
|
|
|
historyIDHeader = "IMAGE"
|
|
createdByHeader = "CREATED BY"
|
|
commentHeader = "COMMENT"
|
|
)
|
|
|
|
// NewHistoryFormat returns a format for rendering an HistoryContext
|
|
func NewHistoryFormat(source string, quiet bool, human bool) Format {
|
|
switch source {
|
|
case TableFormatKey:
|
|
switch {
|
|
case quiet:
|
|
return defaultQuietFormat
|
|
case !human:
|
|
return nonHumanHistoryTableFormat
|
|
default:
|
|
return defaultHistoryTableFormat
|
|
}
|
|
}
|
|
|
|
return Format(source)
|
|
}
|
|
|
|
// HistoryWrite writes the context
|
|
func HistoryWrite(ctx Context, human bool, histories []image.HistoryResponseItem) error {
|
|
render := func(format func(subContext subContext) error) error {
|
|
for _, history := range histories {
|
|
historyCtx := &historyContext{trunc: ctx.Trunc, h: history, human: human}
|
|
if err := format(historyCtx); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
historyCtx := &historyContext{}
|
|
historyCtx.header = map[string]string{
|
|
"ID": historyIDHeader,
|
|
"CreatedSince": createdSinceHeader,
|
|
"CreatedAt": createdAtHeader,
|
|
"CreatedBy": createdByHeader,
|
|
"Size": sizeHeader,
|
|
"Comment": commentHeader,
|
|
}
|
|
return ctx.Write(historyCtx, render)
|
|
}
|
|
|
|
type historyContext struct {
|
|
HeaderContext
|
|
trunc bool
|
|
human bool
|
|
h image.HistoryResponseItem
|
|
}
|
|
|
|
func (c *historyContext) MarshalJSON() ([]byte, error) {
|
|
return marshalJSON(c)
|
|
}
|
|
|
|
func (c *historyContext) ID() string {
|
|
if c.trunc {
|
|
return stringid.TruncateID(c.h.ID)
|
|
}
|
|
return c.h.ID
|
|
}
|
|
|
|
func (c *historyContext) CreatedAt() string {
|
|
var created string
|
|
created = units.HumanDuration(time.Now().UTC().Sub(time.Unix(int64(c.h.Created), 0)))
|
|
return created
|
|
}
|
|
|
|
func (c *historyContext) CreatedSince() string {
|
|
var created string
|
|
created = units.HumanDuration(time.Now().UTC().Sub(time.Unix(int64(c.h.Created), 0)))
|
|
return created + " ago"
|
|
}
|
|
|
|
func (c *historyContext) CreatedBy() string {
|
|
createdBy := strings.Replace(c.h.CreatedBy, "\t", " ", -1)
|
|
if c.trunc {
|
|
createdBy = stringutils.Ellipsis(createdBy, 45)
|
|
}
|
|
return createdBy
|
|
}
|
|
|
|
func (c *historyContext) Size() string {
|
|
size := ""
|
|
if c.human {
|
|
size = units.HumanSizeWithPrecision(float64(c.h.Size), 3)
|
|
} else {
|
|
size = strconv.FormatInt(c.h.Size, 10)
|
|
}
|
|
return size
|
|
}
|
|
|
|
func (c *historyContext) Comment() string {
|
|
return c.h.Comment
|
|
}
|